Просмотр исходного кода

Merge branch 'fix/ios_ai_module_crash_bug' into 'develop'

修复日历的bug,新增修改IM群名称和成员的功能

See merge request o2oa/o2oa!941
楼国栋 5 лет назад
Родитель
Сommit
2e8861ce82

+ 20 - 4
o2ios/O2Platform.xcodeproj/project.pbxproj

@@ -158,6 +158,8 @@
 		B15F8129210EF15E00B81F35 /* OOCalendarEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15F8128210EF15E00B81F35 /* OOCalendarEventViewController.swift */; };
 		B15F8129210EF15E00B81F35 /* OOCalendarEventViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15F8128210EF15E00B81F35 /* OOCalendarEventViewController.swift */; };
 		B15F812C21102BC000B81F35 /* DatePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15F812A21102BBF00B81F35 /* DatePickerView.swift */; };
 		B15F812C21102BC000B81F35 /* DatePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B15F812A21102BBF00B81F35 /* DatePickerView.swift */; };
 		B15F812D21102BC000B81F35 /* DatePickerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B15F812B21102BBF00B81F35 /* DatePickerView.xib */; };
 		B15F812D21102BC000B81F35 /* DatePickerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B15F812B21102BBF00B81F35 /* DatePickerView.xib */; };
+		B162F28924AB0E7300A6BF06 /* O2StringPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B162F28824AB0E7300A6BF06 /* O2StringPicker.swift */; };
+		B162F28B24AB0E9900A6BF06 /* O2StringPicker.xib in Resources */ = {isa = PBXBuildFile; fileRef = B162F28A24AB0E9900A6BF06 /* O2StringPicker.xib */; };
 		B165CCD52241DBD700373B66 /* LWDatePickerDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B165CCD42241DBD700373B66 /* LWDatePickerDialog.swift */; };
 		B165CCD52241DBD700373B66 /* LWDatePickerDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B165CCD42241DBD700373B66 /* LWDatePickerDialog.swift */; };
 		B165CD582242093500373B66 /* CoverVerticalAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B165CD412242093500373B66 /* CoverVerticalAnimation.swift */; };
 		B165CD582242093500373B66 /* CoverVerticalAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B165CD412242093500373B66 /* CoverVerticalAnimation.swift */; };
 		B165CD592242093500373B66 /* PresentrController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B165CD422242093500373B66 /* PresentrController.swift */; };
 		B165CD592242093500373B66 /* PresentrController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B165CD422242093500373B66 /* PresentrController.swift */; };
@@ -1493,6 +1495,8 @@
 		B15F8128210EF15E00B81F35 /* OOCalendarEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OOCalendarEventViewController.swift; sourceTree = "<group>"; };
 		B15F8128210EF15E00B81F35 /* OOCalendarEventViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OOCalendarEventViewController.swift; sourceTree = "<group>"; };
 		B15F812A21102BBF00B81F35 /* DatePickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatePickerView.swift; sourceTree = "<group>"; };
 		B15F812A21102BBF00B81F35 /* DatePickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatePickerView.swift; sourceTree = "<group>"; };
 		B15F812B21102BBF00B81F35 /* DatePickerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DatePickerView.xib; sourceTree = "<group>"; };
 		B15F812B21102BBF00B81F35 /* DatePickerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DatePickerView.xib; sourceTree = "<group>"; };
+		B162F28824AB0E7300A6BF06 /* O2StringPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = O2StringPicker.swift; sourceTree = "<group>"; };
+		B162F28A24AB0E9900A6BF06 /* O2StringPicker.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = O2StringPicker.xib; sourceTree = "<group>"; };
 		B165CCD42241DBD700373B66 /* LWDatePickerDialog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LWDatePickerDialog.swift; sourceTree = "<group>"; };
 		B165CCD42241DBD700373B66 /* LWDatePickerDialog.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LWDatePickerDialog.swift; sourceTree = "<group>"; };
 		B165CD412242093500373B66 /* CoverVerticalAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoverVerticalAnimation.swift; sourceTree = "<group>"; };
 		B165CD412242093500373B66 /* CoverVerticalAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoverVerticalAnimation.swift; sourceTree = "<group>"; };
 		B165CD422242093500373B66 /* PresentrController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentrController.swift; sourceTree = "<group>"; };
 		B165CD422242093500373B66 /* PresentrController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentrController.swift; sourceTree = "<group>"; };
@@ -2803,6 +2807,15 @@
 			path = "opencore-amrnb";
 			path = "opencore-amrnb";
 			sourceTree = "<group>";
 			sourceTree = "<group>";
 		};
 		};
+		B162F25924AB0E1400A6BF06 /* stringsPicker */ = {
+			isa = PBXGroup;
+			children = (
+				B162F28824AB0E7300A6BF06 /* O2StringPicker.swift */,
+				B162F28A24AB0E9900A6BF06 /* O2StringPicker.xib */,
+			);
+			path = stringsPicker;
+			sourceTree = "<group>";
+		};
 		B165CC9D2241DB9F00373B66 /* DatePickerDialogSwift */ = {
 		B165CC9D2241DB9F00373B66 /* DatePickerDialogSwift */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
@@ -2969,6 +2982,7 @@
 		B1EE2C9A2281723A00842F48 /* UI */ = {
 		B1EE2C9A2281723A00842F48 /* UI */ = {
 			isa = PBXGroup;
 			isa = PBXGroup;
 			children = (
 			children = (
+				B162F25924AB0E1400A6BF06 /* stringsPicker */,
 				B19FF868226DBB2200FA0B76 /* o2JsApi */,
 				B19FF868226DBB2200FA0B76 /* o2JsApi */,
 				E4B697052075FA550062F6E8 /* TimerButton */,
 				E4B697052075FA550062F6E8 /* TimerButton */,
 				B1EE2CCD2281729400842F48 /* QDatePicker.swift */,
 				B1EE2CCD2281729400842F48 /* QDatePicker.swift */,
@@ -5737,6 +5751,7 @@
 				E46E6C841DD41F5D00AB7561 /* ZSSimage@2x.png in Resources */,
 				E46E6C841DD41F5D00AB7561 /* ZSSimage@2x.png in Resources */,
 				E4B697012075DE5F0062F6E8 /* OOGuidePageController.xib in Resources */,
 				E4B697012075DE5F0062F6E8 /* OOGuidePageController.xib in Resources */,
 				B1489BFF2490BE51009EE9FD /* IMChatMessageSendViewCell.xib in Resources */,
 				B1489BFF2490BE51009EE9FD /* IMChatMessageSendViewCell.xib in Resources */,
+				B162F28B24AB0E9900A6BF06 /* O2StringPicker.xib in Resources */,
 				E4D23110209C40F600837868 /* OOPersonCollectionViewCell.xib in Resources */,
 				E4D23110209C40F600837868 /* OOPersonCollectionViewCell.xib in Resources */,
 				B167F7672362C60200F182B8 /* CloudFileMoveFolderCell.xib in Resources */,
 				B167F7672362C60200F182B8 /* CloudFileMoveFolderCell.xib in Resources */,
 				E46E6CAD1DD41F5D00AB7561 /* ZSSundo.png in Resources */,
 				E46E6CAD1DD41F5D00AB7561 /* ZSSundo.png in Resources */,
@@ -6500,6 +6515,7 @@
 				B12FD1E22283D5B700E636BA /* NSObject+Theme.swift in Sources */,
 				B12FD1E22283D5B700E636BA /* NSObject+Theme.swift in Sources */,
 				B167F7632362BFC200F182B8 /* CloudFileMoveFolderController.swift in Sources */,
 				B167F7632362BFC200F182B8 /* CloudFileMoveFolderController.swift in Sources */,
 				E4C24B5920844F3C00E426B0 /* SAIInputBarDisplayable.swift in Sources */,
 				E4C24B5920844F3C00E426B0 /* SAIInputBarDisplayable.swift in Sources */,
+				B162F28924AB0E7300A6BF06 /* O2StringPicker.swift in Sources */,
 				B1E0BAA12378FC01001D741F /* O2JPushManager.swift in Sources */,
 				B1E0BAA12378FC01001D741F /* O2JPushManager.swift in Sources */,
 				E4B7819D1DFA9181007B58A9 /* CMSCategoryItemData.swift in Sources */,
 				E4B7819D1DFA9181007B58A9 /* CMSCategoryItemData.swift in Sources */,
 				B15F80F3210EB93000B81F35 /* OOCalendarMainMonthViewController.swift in Sources */,
 				B15F80F3210EB93000B81F35 /* OOCalendarMainMonthViewController.swift in Sources */,
@@ -6863,7 +6879,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 69;
+				CURRENT_PROJECT_VERSION = 72;
 				DEVELOPMENT_TEAM = NTDRU2P6T4;
 				DEVELOPMENT_TEAM = NTDRU2P6T4;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6898,7 +6914,7 @@
 					"$(PROJECT_DIR)/O2Platform/Framework/lame",
 					"$(PROJECT_DIR)/O2Platform/Framework/lame",
 					"$(PROJECT_DIR)/O2Platform/Framework/lame/opencore-amr/lib",
 					"$(PROJECT_DIR)/O2Platform/Framework/lame/opencore-amr/lib",
 				);
 				);
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.1.2;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"$(inherited)",
 					"-ObjC",
 					"-ObjC",
@@ -6979,7 +6995,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 69;
+				CURRENT_PROJECT_VERSION = 72;
 				DEVELOPMENT_TEAM = NTDRU2P6T4;
 				DEVELOPMENT_TEAM = NTDRU2P6T4;
 				ENABLE_BITCODE = NO;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7014,7 +7030,7 @@
 					"$(PROJECT_DIR)/O2Platform/Framework/lame",
 					"$(PROJECT_DIR)/O2Platform/Framework/lame",
 					"$(PROJECT_DIR)/O2Platform/Framework/lame/opencore-amr/lib",
 					"$(PROJECT_DIR)/O2Platform/Framework/lame/opencore-amr/lib",
 				);
 				);
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.1.2;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"$(inherited)",
 					"-ObjC",
 					"-ObjC",

+ 230 - 144
o2ios/O2Platform/App/Calendar-日程管理/Controller/OOCalendarEventViewController.swift

@@ -76,10 +76,17 @@ class OOCalendarEventViewController: UITableViewController {
             eventEndTime.text = Date().add(component: .hour, value: 1).toString("yyyy-MM-dd HH:mm")
             eventEndTime.text = Date().add(component: .hour, value: 1).toString("yyyy-MM-dd HH:mm")
         }
         }
     }
     }
+ 
+    
+    
+    @IBOutlet weak var calendarLabelView: UILabel!
+    @IBOutlet weak var calendarStackView: UIStackView!
+    @IBOutlet weak var remindLabelView: UILabel!
+    @IBOutlet weak var remindStackView: UIStackView!
+    @IBOutlet weak var repeatLabelView: UILabel!
+    @IBOutlet weak var repeatStackView: UIStackView!
+    
     
     
-    @IBOutlet weak var repeatPickerView: UIPickerView!
-    @IBOutlet weak var remindPickerView: UIPickerView!
-    @IBOutlet weak var calendarPickerView: UIPickerView!
     @IBOutlet weak var repeatTableViewCell: UITableViewCell!
     @IBOutlet weak var repeatTableViewCell: UITableViewCell!
     @IBOutlet weak var eventTitle: UITextField!
     @IBOutlet weak var eventTitle: UITextField!
     @IBOutlet weak var eventAllDaySwitch: UISwitch!
     @IBOutlet weak var eventAllDaySwitch: UISwitch!
@@ -120,16 +127,10 @@ class OOCalendarEventViewController: UITableViewController {
             self.navigationItem.title = "新建日程"
             self.navigationItem.title = "新建日程"
         }
         }
         
         
-        // Uncomment the following line to preserve selection between presentations
-        // self.clearsSelectionOnViewWillAppear = false
-
-        // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
-        // self.navigationItem.rightBarButtonItem = self.editButtonItem
         //隐藏输入法
         //隐藏输入法
         eventTitle.delegate = self
         eventTitle.delegate = self
         eventTitle.returnKeyType = .done
         eventTitle.returnKeyType = .done
-//        eventRemark.delegate = self
-//        eventRemark.returnKeyType = .done
+ 
         
         
         eventStartTime.text = Date().toString("yyyy-MM-dd HH:mm")
         eventStartTime.text = Date().toString("yyyy-MM-dd HH:mm")
         eventEndTime.text = Date().add(component: .hour, value: 1).toString("yyyy-MM-dd HH:mm")
         eventEndTime.text = Date().add(component: .hour, value: 1).toString("yyyy-MM-dd HH:mm")
@@ -145,8 +146,85 @@ class OOCalendarEventViewController: UITableViewController {
             }else {
             }else {
                 selectRepeatOther()
                 selectRepeatOther()
             }
             }
+        }else {
+            self.repeatLabelView.text  = self.repeatOptions[0].value
+            self.repeatValue = self.repeatOptions[0].key
+            self.remindLabelView.text = self.remindOptions[0].value
+            self.remindValue = self.remindOptions[0].key
         }
         }
         // 添加点击事件
         // 添加点击事件
+        calendarStackView.addTapGesture { (tap) in
+            let calendarNames = self.calendarList.map { (info) -> String in
+                info.name ?? ""
+            }
+            let calendarIds = self.calendarList.map { (info) -> String in
+                info.id ?? ""
+            }
+            var current = calendarIds[0]
+            if !self.calendarId.isEmpty {
+                current = self.calendarId
+            }
+            let calendarPicker = O2StringPicker.instance(items: calendarNames, completionHandler: { (result) in
+                if let cal = self.calendarList.first(where: { (info) -> Bool in
+                    return info.id == result
+                }) {
+                    self.changeCalendarWithColor(cal)
+                    self.calendarLabelView.text = cal.name
+                }
+            }, values: calendarIds, pickerTitle: "请选择日历", currentValue: current)
+            calendarPicker.show()
+        }
+        remindStackView.addTapGesture { (tap) in
+            let remindnames = self.remindOptions.map { (o) -> String in
+                o.value
+            }
+            let remindIds = self.remindOptions.map { (o) -> String in
+                o.key
+            }
+            var current = remindIds[0]
+            if !self.remindValue.isEmpty {
+                current = self.remindValue
+            }
+            let remindPicker = O2StringPicker.instance(items: remindnames, completionHandler: { (result) in
+                if let op = self.remindOptions.first(where: { (o) -> Bool in
+                    return o.key == result
+                }) {
+                    self.remindValue = op.key
+                    self.remindLabelView.text = op.value
+                }
+               
+            }, values: remindIds, pickerTitle: "请选择提醒方式", currentValue: current)
+            remindPicker.show()
+        }
+        repeatStackView.addTapGesture { (tap) in
+            let repeatNames = self.repeatOptions.map { (o) -> String in
+                o.value
+            }
+            let repeatIds = self.repeatOptions.map { (o) -> String in
+                o.key
+            }
+            var current = repeatIds[0]
+            if !self.repeatValue.isEmpty {
+                current = self.repeatValue
+            }
+            let repeatPicker = O2StringPicker.instance(items: repeatNames, completionHandler: { (result) in
+                if let op = self.repeatOptions.first(where: { (o) -> Bool in
+                    return o.key == result
+                }) {
+                     self.repeatValue = op.key
+                    self.repeatLabelView.text = op.value
+                     if "WEEKLY" ==  self.repeatValue {
+                         self.selectRepeatWeekly()
+                     }else if "NONE" == self.repeatValue || "" == self.repeatValue {
+                         self.selectRepeatNONE()
+                     }else {
+                         self.selectRepeatOther()
+                     }
+                }
+               
+            }, values: repeatIds, pickerTitle: "请选择重复方式", currentValue: current)
+            repeatPicker.show()
+        }
         eventStartTimeStackView.addTapGesture { (tap) in
         eventStartTimeStackView.addTapGesture { (tap) in
             self.showDatePicker(true)
             self.showDatePicker(true)
         }
         }
@@ -186,19 +264,22 @@ class OOCalendarEventViewController: UITableViewController {
         })
         })
         viewModel.getMyCalendarList().then { (calendars) in
         viewModel.getMyCalendarList().then { (calendars) in
             self.calendarList = (calendars.myCalendars ?? []) + (calendars.unitCalendars ?? [])
             self.calendarList = (calendars.myCalendars ?? []) + (calendars.unitCalendars ?? [])
-            self.calendarPickerView.reloadAllComponents()
+            //self.calendarPickerView.reloadAllComponents()
             //初始化颜色
             //初始化颜色
             if !self.calendarList.isEmpty {
             if !self.calendarList.isEmpty {
                 if self.eventInfo != nil {
                 if self.eventInfo != nil {
-                    if let index = self.calendarList.index(where: { (info) -> Bool in
+                    if let index = self.calendarList.firstIndex(where: { (info) -> Bool in
                         return info.id == self.eventInfo?.calendarId
                         return info.id == self.eventInfo?.calendarId
                     }) {
                     }) {
                         self.changeCalendarWithColor(self.calendarList[index], false)
                         self.changeCalendarWithColor(self.calendarList[index], false)
-                        self.calendarPickerView.selectRow(index, inComponent: 0, animated: true)
+                        self.calendarLabelView.text = self.calendarList[index].name
+                        //self.calendarPickerView.selectRow(index, inComponent: 0, animated: true)
                     }else {
                     }else {
+                        self.calendarLabelView.text = self.calendarList[0].name
                         self.changeCalendarWithColor(self.calendarList[0])
                         self.changeCalendarWithColor(self.calendarList[0])
                     }
                     }
                 }else {
                 }else {
+                    self.calendarLabelView.text = self.calendarList[0].name
                     self.changeCalendarWithColor(self.calendarList[0])
                     self.changeCalendarWithColor(self.calendarList[0])
                 }
                 }
             }
             }
@@ -213,10 +294,11 @@ class OOCalendarEventViewController: UITableViewController {
 
 
     @objc func registerCompletion(notification:Notification){
     @objc func registerCompletion(notification:Notification){
         let theData = notification.userInfo!
         let theData = notification.userInfo!
-        let contentHtml = theData["contentHtml"] as! String
-        print("contentHtml =" , contentHtml)
-        self.eventRemark = contentHtml
-        self.webRemark.loadHTMLString(contentHtml == nil ? "" : contentHtml, baseURL: nil)
+        if let contentHtml = theData["contentHtml"] as? String {
+            print("contentHtml =" , contentHtml)
+            self.eventRemark = contentHtml
+            self.webRemark.loadHTMLString(contentHtml, baseURL: nil)
+        }
     }
     }
 
 
     
     
@@ -265,7 +347,7 @@ class OOCalendarEventViewController: UITableViewController {
         if let color = calendar?.color {
         if let color = calendar?.color {
             if isChangeColorValue {
             if isChangeColorValue {
                 colorValue = color
                 colorValue = color
-                if let index = self.colorOptions.index(where: { (colorString) -> Bool in
+                if let index = self.colorOptions.firstIndex(where: { (colorString) -> Bool in
                     return color == colorString
                     return color == colorString
                 }) {
                 }) {
                     self.selectColorView(tag: index)
                     self.selectColorView(tag: index)
@@ -367,11 +449,12 @@ class OOCalendarEventViewController: UITableViewController {
                 showError(title: "开始日期或结束日期错误!")
                 showError(title: "开始日期或结束日期错误!")
                 return
                 return
             }
             }
-            if start!.compare(end!) != .orderedAscending {
-                showError(title: "开始日期不能大于结束日期!")
-                return
-            }
-            MBProgressHUD_JChat.showMessage(message: "正在保存...", toView: self.view)
+            if !(allday && startTime == endTime) && start!.compare(end!) != .orderedAscending {
+               showError(title: "开始日期不能大于结束日期!")
+               return
+           }
+             
+            self.showLoading()
             let event = OOCalendarEventInfo.init()
             let event = OOCalendarEventInfo.init()
             event.title = title
             event.title = title
             event.calendarId = calendarId
             event.calendarId = calendarId
@@ -386,7 +469,7 @@ class OOCalendarEventViewController: UITableViewController {
                 DDLogInfo("保存结果:\(result)")
                 DDLogInfo("保存结果:\(result)")
                 self.closeWindow()
                 self.closeWindow()
                 }.always{
                 }.always{
-                    MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                    self.hideLoading()
                 }.catch { (error) in
                 }.catch { (error) in
                     DDLogError(error.localizedDescription)
                     DDLogError(error.localizedDescription)
                     self.showError(title: "保存日程错误!")
                     self.showError(title: "保存日程错误!")
@@ -415,11 +498,11 @@ class OOCalendarEventViewController: UITableViewController {
             showError(title: "开始日期或结束日期错误!")
             showError(title: "开始日期或结束日期错误!")
             return
             return
         }
         }
-        if start!.compare(end!) != .orderedAscending {
+        if !(allday && startTime == endTime) && start!.compare(end!) != .orderedAscending {
             showError(title: "开始日期不能大于结束日期!")
             showError(title: "开始日期不能大于结束日期!")
             return
             return
         }
         }
-        MBProgressHUD_JChat.showMessage(message: "正在保存...", toView: self.view)
+        self.showLoading()
         eventInfo?.title = title
         eventInfo?.title = title
         eventInfo?.calendarId = calendarId
         eventInfo?.calendarId = calendarId
         eventInfo?.color = colorValue
         eventInfo?.color = colorValue
@@ -447,7 +530,7 @@ class OOCalendarEventViewController: UITableViewController {
             DDLogInfo("保存结果:\(result)")
             DDLogInfo("保存结果:\(result)")
             self.closeWindow()
             self.closeWindow()
             }.always{
             }.always{
-                MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                self.hideLoading()
             }.catch { (error) in
             }.catch { (error) in
                 DDLogError(error.localizedDescription)
                 DDLogError(error.localizedDescription)
                 self.showError(title: "更新单个日程错误!")
                 self.showError(title: "更新单个日程错误!")
@@ -458,7 +541,7 @@ class OOCalendarEventViewController: UITableViewController {
             DDLogInfo("保存结果:\(result)")
             DDLogInfo("保存结果:\(result)")
             self.closeWindow()
             self.closeWindow()
             }.always{
             }.always{
-                MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                self.hideLoading()
             }.catch { (error) in
             }.catch { (error) in
                 DDLogError(error.localizedDescription)
                 DDLogError(error.localizedDescription)
                 self.showError(title: "更新after日程错误!")
                 self.showError(title: "更新after日程错误!")
@@ -469,7 +552,7 @@ class OOCalendarEventViewController: UITableViewController {
             DDLogInfo("保存结果:\(result)")
             DDLogInfo("保存结果:\(result)")
             self.closeWindow()
             self.closeWindow()
             }.always{
             }.always{
-                MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                self.hideLoading()
             }.catch { (error) in
             }.catch { (error) in
                 DDLogError(error.localizedDescription)
                 DDLogError(error.localizedDescription)
                 self.showError(title: "更新all日程错误!")
                 self.showError(title: "更新all日程错误!")
@@ -495,14 +578,14 @@ class OOCalendarEventViewController: UITableViewController {
     }
     }
     
     
     private func deleteEvent(type: Int) {
     private func deleteEvent(type: Int) {
-        MBProgressHUD_JChat.showMessage(message: "正在删除...", toView: self.view)
+        self.showLoading()
         switch type {
         switch type {
         case 0:
         case 0:
             viewModel.deleteCalendarEventSingle(id: (eventInfo?.id!)!).then { (result)  in
             viewModel.deleteCalendarEventSingle(id: (eventInfo?.id!)!).then { (result)  in
                 DDLogInfo("删除结果:\(result)")
                 DDLogInfo("删除结果:\(result)")
                 self.closeWindow()
                 self.closeWindow()
                 }.always{
                 }.always{
-                    MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                    self.hideLoading()
                 }.catch { (error) in
                 }.catch { (error) in
                     DDLogError(error.localizedDescription)
                     DDLogError(error.localizedDescription)
                     self.showError(title: "删除Single日程错误!")
                     self.showError(title: "删除Single日程错误!")
@@ -512,7 +595,7 @@ class OOCalendarEventViewController: UITableViewController {
                 DDLogInfo("删除结果:\(result)")
                 DDLogInfo("删除结果:\(result)")
                 self.closeWindow()
                 self.closeWindow()
                 }.always{
                 }.always{
-                    MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                    self.hideLoading()
                 }.catch { (error) in
                 }.catch { (error) in
                     DDLogError(error.localizedDescription)
                     DDLogError(error.localizedDescription)
                     self.showError(title: "删除After日程错误!")
                     self.showError(title: "删除After日程错误!")
@@ -522,7 +605,7 @@ class OOCalendarEventViewController: UITableViewController {
                 DDLogInfo("删除结果:\(result)")
                 DDLogInfo("删除结果:\(result)")
                 self.closeWindow()
                 self.closeWindow()
                 }.always{
                 }.always{
-                    MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+                    self.hideLoading()
                 }.catch { (error) in
                 }.catch { (error) in
                     DDLogError(error.localizedDescription)
                     DDLogError(error.localizedDescription)
                     self.showError(title: "删除All日程错误!")
                     self.showError(title: "删除All日程错误!")
@@ -547,7 +630,7 @@ class OOCalendarEventViewController: UITableViewController {
         }
         }
         if let color = eventInfo?.color {
         if let color = eventInfo?.color {
             colorValue = color
             colorValue = color
-            if let index = self.colorOptions.index(where: { (colorString) -> Bool in
+            if let index = self.colorOptions.firstIndex(where: { (colorString) -> Bool in
                 return color == colorString
                 return color == colorString
             }) {
             }) {
                 self.selectColorView(tag: index)
                 self.selectColorView(tag: index)
@@ -556,25 +639,27 @@ class OOCalendarEventViewController: UITableViewController {
         if let remind = eventInfo?.valarmTime_config {
         if let remind = eventInfo?.valarmTime_config {
             if remind != "" {
             if remind != "" {
                 remindValue = remind
                 remindValue = remind
-                if let index = self.remindOptions.index(where: { (r) -> Bool in
+                if let index = self.remindOptions.firstIndex(where: { (r) -> Bool in
                     return remind == r.key
                     return remind == r.key
                 }) {
                 }) {
-                    self.remindPickerView.selectRow(index, inComponent: 0, animated: true)
+//                    self.remindPickerView.selectRow(index, inComponent: 0, animated: true)
+                    self.remindLabelView.text = self.remindOptions[index].value
                 }
                 }
             }
             }
         }
         }
         if let repeatupdate = eventInfo?.recurrenceRule {
         if let repeatupdate = eventInfo?.recurrenceRule {
             rruleDecode(rrule: repeatupdate)
             rruleDecode(rrule: repeatupdate)
             DDLogInfo("freq:\(self.repeatValue)")
             DDLogInfo("freq:\(self.repeatValue)")
-            if let index = self.repeatOptions.index(where: { (re) -> Bool in
+            if let index = self.repeatOptions.firstIndex(where: { (re) -> Bool in
                 return  self.repeatValue != "" && re.key == self.repeatValue
                 return  self.repeatValue != "" && re.key == self.repeatValue
             }){
             }){
-                self.repeatPickerView.selectRow(index, inComponent: 0, animated: true)
+//                self.repeatPickerView.selectRow(index, inComponent: 0, animated: true)
+                self.repeatLabelView.text  = self.repeatOptions[index].value
             }
             }
         }
         }
         // eventRemark.text = eventInfo?.comment
         // eventRemark.text = eventInfo?.comment
-         eventRemark = eventInfo?.comment as! String
-         self.webRemark.loadHTMLString(eventRemark == nil ? "" : eventRemark, baseURL: nil)
+         eventRemark = eventInfo?.comment ?? ""
+         self.webRemark.loadHTMLString(eventRemark, baseURL: nil)
 
 
     }
     }
     
     
@@ -588,10 +673,8 @@ class OOCalendarEventViewController: UITableViewController {
             if rruleItem.contains("UNTIL") {
             if rruleItem.contains("UNTIL") {
                 DDLogInfo("UNTIL:\(rruleItem)")
                 DDLogInfo("UNTIL:\(rruleItem)")
                 let untilDate = rruleItem.split("=")[1]
                 let untilDate = rruleItem.split("=")[1]
-                let date = try? untilDate.subString(from:0, to: 8)
-                if date != nil {
-                    untilDateLabel.text = Date.date(date!, formatter: "yyyyMMdd")?.toString("yyyy-MM-dd")
-                }
+                let date = untilDate.subString(from:0, to: 8)
+                untilDateLabel.text = Date.date(date, formatter: "yyyyMMdd")?.toString("yyyy-MM-dd")
             }
             }
             if rruleItem.contains("BYDAY") {
             if rruleItem.contains("BYDAY") {
                 DDLogInfo("BYDAY:\(rruleItem)")
                 DDLogInfo("BYDAY:\(rruleItem)")
@@ -650,111 +733,24 @@ class OOCalendarEventViewController: UITableViewController {
                 return CGFloat(90)
                 return CGFloat(90)
             }
             }
         case 6:
         case 6:
-            if eventInfo != nil && eventInfo?.id != nil {
-                if canUpdate {
-                    deleteBtn.isHidden = false
-                    return CGFloat(140)
-                }else {
-                    deleteBtn.isHidden = true
-                    return CGFloat(100)
-                }
-            }else {
-                deleteBtn.isHidden = true
-                return CGFloat(100)
-            }
+//            if eventInfo != nil && eventInfo?.id != nil {
+//                if canUpdate {
+//                    deleteBtn.isHidden = false
+//                    return CGFloat(140)
+//                }else {
+//                    deleteBtn.isHidden = true
+//                    return CGFloat(100)
+//                }
+//            }else {
+//                deleteBtn.isHidden = true
+//                return CGFloat(100)
+//            }
+            return CGFloat(160)
         default:
         default:
             return CGFloat(45)
             return CGFloat(45)
         }
         }
     }
     }
 
 
-}
-
-//MARK: - extension
-
-extension OOCalendarEventViewController: UIPickerViewDelegate, UIPickerViewDataSource {
-    // 几级选项器
-    func numberOfComponents(in pickerView: UIPickerView) -> Int {
-        
-        return 1
-    }
-    // 多少行数据
-    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
-        switch pickerView.tag {
-        case 110://日历选项
-            return calendarList.count
-        case 111: // 提醒选项
-            return remindOptions.count
-        case 112: // 重复选项
-            return repeatOptions.count
-        default:
-            return 0
-        }
-    }
-    // 选项显示名称
-//    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
-//        switch pickerView.tag {
-//        case 110://日历选项
-//            return calendarList[row].name
-//        case 111: // 提醒选项
-//            return remindOptions[row].value
-//        case 112: // 重复选项
-//            return repeatOptions[row].value
-//        default:
-//            return ""
-//        }
-//    }
-    // 选项 view
-    func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
-        var title = ""
-        switch pickerView.tag {
-        case 110://日历选项
-            title =  calendarList[row].name ?? ""
-        case 111: // 提醒选项
-            title = remindOptions[row].value
-        case 112: // 重复选项
-            title = repeatOptions[row].value
-        default:
-            title = ""
-        }
-        
-        if view == nil {
-            let titleLabel = UILabel.init()
-            titleLabel.adjustsFontSizeToFitWidth  = true
-            titleLabel.textAlignment = NSTextAlignment.center
-            titleLabel.textColor = UIColor.darkGray
-            titleLabel.font = setting_item_textFont
-            titleLabel.text = title
-            return titleLabel
-        }else {
-            let titleLabel = view as! UILabel
-            titleLabel.text = title
-            return titleLabel
-        }
-    }
-    // 选中
-    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
-        switch pickerView.tag {
-        case 110://日历选项
-            
-            self.changeCalendarWithColor(calendarList[row])
-        case 111: // 提醒选项
-            
-            remindValue = remindOptions[row].key
-        case 112: // 重复选项
-            
-            repeatValue = repeatOptions[row].key
-            if "WEEKLY" ==  repeatValue {
-                selectRepeatWeekly()
-            }else if "NONE" == repeatValue || "" == repeatValue {
-                selectRepeatNONE()
-            }else {
-                selectRepeatOther()
-            }
-        default:
-            DDLogError("啥pickerView????")
-        }
-    }
-    
     private func selectRepeatWeekly() {
     private func selectRepeatWeekly() {
         self.tableView.beginUpdates()
         self.tableView.beginUpdates()
         self.repeatTableViewCell.frame.size.height = CGFloat(120)
         self.repeatTableViewCell.frame.size.height = CGFloat(120)
@@ -776,8 +772,98 @@ extension OOCalendarEventViewController: UIPickerViewDelegate, UIPickerViewDataS
         untilDateStackView.isHidden = false
         untilDateStackView.isHidden = false
         self.tableView.endUpdates()
         self.tableView.endUpdates()
     }
     }
+    
 }
 }
 
 
+//MARK: - extension
+
+//extension OOCalendarEventViewController: UIPickerViewDelegate, UIPickerViewDataSource {
+//    // 几级选项器
+//    func numberOfComponents(in pickerView: UIPickerView) -> Int {
+//
+//        return 1
+//    }
+//    // 多少行数据
+//    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+//        switch pickerView.tag {
+//        case 110://日历选项
+//            return calendarList.count
+//        case 111: // 提醒选项
+//            return remindOptions.count
+//        case 112: // 重复选项
+//            return repeatOptions.count
+//        default:
+//            return 0
+//        }
+//    }
+//    // 选项显示名称
+////    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+////        switch pickerView.tag {
+////        case 110://日历选项
+////            return calendarList[row].name
+////        case 111: // 提醒选项
+////            return remindOptions[row].value
+////        case 112: // 重复选项
+////            return repeatOptions[row].value
+////        default:
+////            return ""
+////        }
+////    }
+//    // 选项 view
+//    func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
+//        var title = ""
+//        switch pickerView.tag {
+//        case 110://日历选项
+//            title =  calendarList[row].name ?? ""
+//        case 111: // 提醒选项
+//            title = remindOptions[row].value
+//        case 112: // 重复选项
+//            title = repeatOptions[row].value
+//        default:
+//            title = ""
+//        }
+//
+//        if view == nil {
+//            let titleLabel = UILabel.init()
+//            titleLabel.adjustsFontSizeToFitWidth  = true
+//            titleLabel.textAlignment = NSTextAlignment.center
+//            titleLabel.textColor = UIColor.darkGray
+//            titleLabel.font = setting_item_textFont
+//            titleLabel.text = title
+//            return titleLabel
+//        }else {
+//            let titleLabel = view as! UILabel
+//            titleLabel.text = title
+//            return titleLabel
+//        }
+//    }
+//    // 选中
+//    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+//        switch pickerView.tag {
+//        case 110://日历选项
+//
+//            self.changeCalendarWithColor(calendarList[row])
+//        case 111: // 提醒选项
+//
+//            remindValue = remindOptions[row].key
+//        case 112: // 重复选项
+//
+//            repeatValue = repeatOptions[row].key
+//            if "WEEKLY" ==  repeatValue {
+//                selectRepeatWeekly()
+//            }else if "NONE" == repeatValue || "" == repeatValue {
+//                selectRepeatNONE()
+//            }else {
+//                selectRepeatOther()
+//            }
+//        default:
+//            DDLogError("啥pickerView????")
+//        }
+//    }
+//
+//
+//}
+
 extension OOCalendarEventViewController: UITextFieldDelegate {
 extension OOCalendarEventViewController: UITextFieldDelegate {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         return textField.resignFirstResponder()
         return textField.resignFirstResponder()

+ 4 - 4
o2ios/O2Platform/App/Calendar-日程管理/Controller/OOCalendarMainMonthViewController.swift

@@ -104,7 +104,7 @@ class OOCalendarMainMonthViewController: UIViewController {
         self.performSegue(withIdentifier: "showEventDetail", sender: "add")
         self.performSegue(withIdentifier: "showEventDetail", sender: "add")
     }
     }
     private func loadData() {
     private func loadData() {
-        MBProgressHUD_JChat.showMessage(message: "loading...", toView: view)
+        self.showLoading()
         let filter = OOCalendarEventFilter()
         let filter = OOCalendarEventFilter()
         filter.startTime = self._startTime?.toString("yyyy-MM-dd HH:mm:ss")
         filter.startTime = self._startTime?.toString("yyyy-MM-dd HH:mm:ss")
         filter.endTime = self._endTime?.toString("yyyy-MM-dd HH:mm:ss")
         filter.endTime = self._endTime?.toString("yyyy-MM-dd HH:mm:ss")
@@ -145,15 +145,15 @@ class OOCalendarMainMonthViewController: UIViewController {
                 fulfill(result)
                 fulfill(result)
             }
             }
             }.then { (dict) in
             }.then { (dict) in
-                MBProgressHUD_JChat.hide(forView: self.view, animated: true)
                 DDLogInfo("filter 结果: \(dict.count)")
                 DDLogInfo("filter 结果: \(dict.count)")
                 self.eventsByDate = dict
                 self.eventsByDate = dict
                 // 刷新页面
                 // 刷新页面
                 self.calendarViewDic[0]?.reloadData()
                 self.calendarViewDic[0]?.reloadData()
                 self.calendarViewDic[0]?.select(self._selectDay)
                 self.calendarViewDic[0]?.select(self._selectDay)
                 self.selectCalendarDate(self._selectDay!)
                 self.selectCalendarDate(self._selectDay!)
-            }.catch { (error) in
-                MBProgressHUD_JChat.hide(forView: self.view, animated: true)
+        }.always {
+            self.hideLoading()
+        }.catch { (error) in
                 DDLogError(error.localizedDescription)
                 DDLogError(error.localizedDescription)
         }
         }
     }
     }

+ 338 - 338
o2ios/O2Platform/App/Calendar-日程管理/Controller/OOCalendarViewController.swift

@@ -11,8 +11,8 @@ import CocoaLumberjack
 import O2OA_Auth_SDK
 import O2OA_Auth_SDK
 
 
 class OOCalendarViewController: UITableViewController {
 class OOCalendarViewController: UITableViewController {
-    
-    private let colorOptions = ["#428ffc", "#5bcc61",  "#f9bf24",  "#f75f59", "#f180f7", "#9072f1", "#909090", "#1462be"]
+
+    private let colorOptions = ["#428ffc", "#5bcc61", "#f9bf24", "#f75f59", "#f180f7", "#9072f1", "#909090", "#1462be"]
     private lazy var viewModel: OOCalendarViewModel = {
     private lazy var viewModel: OOCalendarViewModel = {
         return OOCalendarViewModel()
         return OOCalendarViewModel()
     }()
     }()
@@ -21,115 +21,115 @@ class OOCalendarViewController: UITableViewController {
     private var count = 0
     private var count = 0
 
 
     override func numberOfSections(in tableView: UITableView) -> Int {
     override func numberOfSections(in tableView: UITableView) -> Int {
-       // #warning Incomplete implementation, return the number of sections
-       return 3
+        // #warning Incomplete implementation, return the number of sections
+        return 3
     }
     }
 
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-       // #warning Incomplete implementation, return the number of rows
-           if  section == 0 {
-                return 5
-            }else if section == 1 {
-                return count
-            }else{
-                return 1
-            }
+        // #warning Incomplete implementation, return the number of rows
+        if section == 0 {
+            return 5
+        } else if section == 1 {
+            return count
+        } else {
+            return 1
+        }
     }
     }
 
 
 
 
     // MARK: - IB
     // MARK: - IB
-      @IBOutlet weak var calendarNameField: UITextField!
-      @IBOutlet weak var calendarIsOpenSwitch: UISwitch!
-      @IBOutlet weak var calendarColorStackView: UIStackView!
-      @IBOutlet weak var calendarRemarkField: UITextField!
-      @IBOutlet weak var calendarDeleteBtn: UIButton!
-      
-    
-      @IBOutlet weak var calendarTypeField: UITextField!
-      @IBOutlet weak var calendarOrgField: UITextField!
-      @IBOutlet weak var calendarManagerField: UITextField!
-      @IBOutlet weak var calendarScopeField: UITextField!
-      @IBOutlet weak var calendarNewScopeField: UITextField!
-      
-      @IBOutlet weak var calendarStatusSwitch: UISwitch!
-      
-      @IBOutlet weak var calendarIsOpenBtn: UIButton!
-      
-      @IBAction func editRemarkBtn(_ sender: Any) {
-            self.performSegue(withIdentifier: "ShowEditRemark", sender: nil)
-      }
-      
-
-      
-      
-      @IBAction func deleteBtnTap(_ sender: UIButton) {
-          showDefaultConfirm(title: "删除日历", message: "确定要删除当前日历吗,会同时删除该日历下的日程事件?") { (action) in
-              self.deleteCalendar()
-          }
-      }
-      
-      //选择是否公开
-      @IBAction func selectType(_ sender: Any) {
-          let alertController = UIAlertController(title: "请选择类型", message: "",preferredStyle:.actionSheet)
-          var selectStyle = UIAlertAction.Style.default
-          selectStyle = (calendarTypeField.text == "个人日历") ?  UIAlertAction.Style.default:UIAlertAction.Style.destructive
-          let personAction = UIAlertAction(title: "个人日历", style:selectStyle, handler: {action in
-          self.calendarTypeField.text =  action.title
-          self.count = 0
-          let section = NSIndexSet(index: 1)
-          self.tableView.beginUpdates()
-          self.tableView.reloadSections(section as IndexSet, with: .automatic)
-          self.tableView.endUpdates()
-         })
-          selectStyle = (calendarTypeField.text == "组织日历") ? UIAlertAction.Style.default:UIAlertAction.Style.destructive
-         let orgAction = UIAlertAction(title: "组织日历", style: selectStyle, handler: {action in
-              self.calendarTypeField.text = action.title
-              self.count = 4
-              let section = NSIndexSet(index: 1)
-              self.tableView.beginUpdates()
-              self.tableView.reloadSections(section as IndexSet, with: .automatic)
-              self.tableView.endUpdates()
-         })
-         alertController.addAction(personAction)
-         alertController.addAction(orgAction)
-         self.present(alertController, animated: true, completion: nil)
-      }
-
-    
-    
+    @IBOutlet weak var calendarNameField: UITextField!
+    @IBOutlet weak var calendarIsOpenSwitch: UISwitch!
+    @IBOutlet weak var calendarColorStackView: UIStackView!
+    @IBOutlet weak var calendarRemarkField: UITextField!
+    @IBOutlet weak var calendarDeleteBtn: UIButton!
+
+
+    @IBOutlet weak var calendarTypeField: UITextField!
+    @IBOutlet weak var calendarOrgField: UITextField!
+    @IBOutlet weak var calendarManagerField: UITextField!
+    @IBOutlet weak var calendarScopeField: UITextField!
+    @IBOutlet weak var calendarNewScopeField: UITextField!
+
+    @IBOutlet weak var calendarStatusSwitch: UISwitch!
+
+    @IBOutlet weak var calendarIsOpenBtn: UIButton!
+
+    @IBAction func editRemarkBtn(_ sender: Any) {
+        self.performSegue(withIdentifier: "ShowEditRemark", sender: nil)
+    }
+
+
+
+
+    @IBAction func deleteBtnTap(_ sender: UIButton) {
+        showDefaultConfirm(title: "删除日历", message: "确定要删除当前日历吗,会同时删除该日历下的日程事件?") { (action) in
+            self.deleteCalendar()
+        }
+    }
+
+    //选择是否公开
+    @IBAction func selectType(_ sender: Any) {
+        let alertController = UIAlertController(title: "请选择类型", message: "", preferredStyle: .actionSheet)
+        var selectStyle = UIAlertAction.Style.default
+        selectStyle = (calendarTypeField.text == "个人日历") ? UIAlertAction.Style.default : UIAlertAction.Style.destructive
+        let personAction = UIAlertAction(title: "个人日历", style: selectStyle, handler: { action in
+            self.calendarTypeField.text = action.title
+            self.count = 0
+            let section = NSIndexSet(index: 1)
+            self.tableView.beginUpdates()
+            self.tableView.reloadSections(section as IndexSet, with: .none)
+            self.tableView.endUpdates()
+        })
+        selectStyle = (calendarTypeField.text == "组织日历") ? UIAlertAction.Style.default : UIAlertAction.Style.destructive
+        let orgAction = UIAlertAction(title: "组织日历", style: selectStyle, handler: { action in
+            self.calendarTypeField.text = action.title
+            self.count = 4
+            let section = NSIndexSet(index: 1)
+            self.tableView.beginUpdates()
+            self.tableView.reloadSections(section as IndexSet, with: .none)
+            self.tableView.endUpdates()
+        })
+        alertController.addAction(personAction)
+        alertController.addAction(orgAction)
+        self.present(alertController, animated: true, completion: nil)
+    }
+
+
+
     override func viewDidLoad() {
     override func viewDidLoad() {
         super.viewDidLoad()
         super.viewDidLoad()
         if calendarInfo != nil && calendarInfo?.id != nil {
         if calendarInfo != nil && calendarInfo?.id != nil {
             self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "修改", style: .plain, target: self, action: #selector(tapSave))
             self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "修改", style: .plain, target: self, action: #selector(tapSave))
             self.navigationItem.title = "修改日历"
             self.navigationItem.title = "修改日历"
-        }else {
+        } else {
             self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "保存", style: .plain, target: self, action: #selector(tapSave))
             self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "保存", style: .plain, target: self, action: #selector(tapSave))
             self.navigationItem.title = "新增日历"
             self.navigationItem.title = "新增日历"
         }
         }
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
         self.tableView.tableFooterView = UIView(frame: CGRect.zero)
-        
+
         if calendarInfo != nil && calendarInfo?.id != nil {
         if calendarInfo != nil && calendarInfo?.id != nil {
             loadCalendarInfoFromNet()
             loadCalendarInfoFromNet()
             calendarDeleteBtn.isHidden = false
             calendarDeleteBtn.isHidden = false
-        }else {
+        } else {
             self.calendarInfo = OOCalendarInfo.init()
             self.calendarInfo = OOCalendarInfo.init()
             calendarDeleteBtn.isHidden = true
             calendarDeleteBtn.isHidden = true
         }
         }
 
 
-        
+
         //隐藏输入法
         //隐藏输入法
         calendarNameField.delegate = self
         calendarNameField.delegate = self
         calendarNameField.returnKeyType = .done
         calendarNameField.returnKeyType = .done
-        
+
         calendarTypeField.delegate = self
         calendarTypeField.delegate = self
         calendarTypeField.returnKeyType = .done
         calendarTypeField.returnKeyType = .done
-        
+
         calendarRemarkField.delegate = self
         calendarRemarkField.delegate = self
         calendarRemarkField.returnKeyType = .done
         calendarRemarkField.returnKeyType = .done
-        
+
         calendarColorStackView?.subviews.forEach({ (colorView) in
         calendarColorStackView?.subviews.forEach({ (colorView) in
             colorView.isUserInteractionEnabled = true
             colorView.isUserInteractionEnabled = true
-            colorView.addGestureRecognizer(UITapGestureRecognizer(target: self, action:#selector(tapColorView)))
+            colorView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(tapColorView)))
         })
         })
 
 
     }
     }
@@ -138,84 +138,84 @@ class OOCalendarViewController: UITableViewController {
         super.didReceiveMemoryWarning()
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
         // Dispose of any resources that can be recreated.
     }
     }
-    
+
     // MARK: - private func
     // MARK: - private func
     //隐藏输入法
     //隐藏输入法
     private func hideKeyboard() {
     private func hideKeyboard() {
         self.view.endEditing(true)
         self.view.endEditing(true)
     }
     }
-    
+
     @objc func tapSave() {
     @objc func tapSave() {
         hideKeyboard()
         hideKeyboard()
-      let name = calendarNameField.text
-      let isopen = calendarIsOpenSwitch.isOn
-      
-      var type = "PERSON"
-      if let typeValue = calendarTypeField.text{
-          if typeValue == "个人日历" {
-               type = "PERSON"
-          }else{
-               type = "UNIT"
-          }
-      }
-      let remark = calendarRemarkField.text
-      if name == nil || name == "" {
-          showError(title: "日历名称不能为空!")
-          return
-      }
-      
-      MBProgressHUD_JChat.showMessage(message: "正在保存...", toView: self.view)
-      /*
+        let name = calendarNameField.text
+        let isopen = calendarIsOpenSwitch.isOn
+
+        var type = "PERSON"
+        if let typeValue = calendarTypeField.text {
+            if typeValue == "个人日历" {
+                type = "PERSON"
+            } else {
+                type = "UNIT"
+            }
+        }
+        let remark = calendarRemarkField.text
+        if name == nil || name == "" {
+            showError(title: "日历名称不能为空!")
+            return
+        }
+
+        MBProgressHUD_JChat.showMessage(message: "正在保存...", toView: self.view)
+        /*
       var calendar = self.calendarInfo
       var calendar = self.calendarInfo
       if calendarInfo != nil && calendarInfo?.id != nil { // 修改
       if calendarInfo != nil && calendarInfo?.id != nil { // 修改
           //calendar.id = calendarInfo?.id!
           //calendar.id = calendarInfo?.id!
           calendar = calendarInfo ?? OOCalendarInfo.init()
           calendar = calendarInfo ?? OOCalendarInfo.init()
       }*/
       }*/
-      
-      self.calendarInfo!.name = name
-      self.calendarInfo!.isPublic = isopen
-      
-      if type == "PERSON" {
-          if let account = O2AuthSDK.shared.myInfo() {
-              self.calendarInfo!.target = account.distinguishedName
-          }
-      }
-      self.calendarInfo!.color = colorValue
-      self.calendarInfo!.type = type
-      self.calendarInfo!.desc = remark ?? ""
-      
-     // calendar.status=="OPEN",
-      if calendarStatusSwitch.isOn {
-          self.calendarInfo!.status = "OPEN"
-      }else{
-          self.calendarInfo!.status = "CLOSE"
-      }
-    
-     viewModel.saveCalendar(calendar: self.calendarInfo!)
-          .then { (result) in
-              DDLogInfo("保存日历成功!!!\(result)")
-              self.closeWindow()
-          }.always{
-              MBProgressHUD_JChat.hide(forView: self.view, animated: false)
-          }.catch { (error) in
-              DDLogError(error.localizedDescription)
-              self.showError(title: "保存日历错误!")
-      }
+
+        self.calendarInfo!.name = name
+        self.calendarInfo!.isPublic = isopen
+
+        if type == "PERSON" {
+            if let account = O2AuthSDK.shared.myInfo() {
+                self.calendarInfo!.target = account.distinguishedName
+            }
+        }
+        self.calendarInfo!.color = colorValue
+        self.calendarInfo!.type = type
+        self.calendarInfo!.desc = remark ?? ""
+
+        // calendar.status=="OPEN",
+        if calendarStatusSwitch.isOn {
+            self.calendarInfo!.status = "OPEN"
+        } else {
+            self.calendarInfo!.status = "CLOSE"
+        }
+
+        viewModel.saveCalendar(calendar: self.calendarInfo!)
+            .then { (result) in
+                DDLogInfo("保存日历成功!!!\(result)")
+                self.closeWindow()
+            }.always {
+                MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+            }.catch { (error) in
+                DDLogError(error.localizedDescription)
+                self.showError(title: "保存日历错误!")
+        }
 
 
     }
     }
     private func deleteCalendar() {
     private func deleteCalendar() {
         MBProgressHUD_JChat.showMessage(message: "正在删除...", toView: self.view)
         MBProgressHUD_JChat.showMessage(message: "正在删除...", toView: self.view)
-        viewModel.deleteCalendar(id: (calendarInfo?.id!)!).then { (result)  in
+        viewModel.deleteCalendar(id: (calendarInfo?.id!)!).then { (result) in
             DDLogInfo("删除结果:\(result)")
             DDLogInfo("删除结果:\(result)")
             self.closeWindow()
             self.closeWindow()
-            }.always{
-                MBProgressHUD_JChat.hide(forView: self.view, animated: false)
-            }.catch { (error) in
-                DDLogError(error.localizedDescription)
-                self.showError(title: "删除日历错误!")
+        }.always {
+            MBProgressHUD_JChat.hide(forView: self.view, animated: false)
+        }.catch { (error) in
+            DDLogError(error.localizedDescription)
+            self.showError(title: "删除日历错误!")
         }
         }
     }
     }
-    
+
     @objc func tapColorView(_ tap: UITapGestureRecognizer) {
     @objc func tapColorView(_ tap: UITapGestureRecognizer) {
         hideKeyboard()
         hideKeyboard()
         if let tag = tap.view?.tag {
         if let tag = tap.view?.tag {
@@ -228,28 +228,28 @@ class OOCalendarViewController: UITableViewController {
         calendarColorStackView.subviews.forEach { (colorView) in
         calendarColorStackView.subviews.forEach { (colorView) in
             if colorView.tag == tag {
             if colorView.tag == tag {
                 colorView.subviews[0].isHidden = false
                 colorView.subviews[0].isHidden = false
-            }else {
+            } else {
                 colorView.subviews[0].isHidden = true
                 colorView.subviews[0].isHidden = true
             }
             }
         }
         }
     }
     }
     //选择所属组织
     //选择所属组织
     @IBAction func selectOrg(_ sender: Any) {
     @IBAction func selectOrg(_ sender: Any) {
-        let  arrModes = [ContactPickerType.unit]
+        let arrModes = [ContactPickerType.unit]
         showContactPicker(modes: arrModes, callback: {
         showContactPicker(modes: arrModes, callback: {
             (O2BizContactPickerResult) in
             (O2BizContactPickerResult) in
             if let depts = O2BizContactPickerResult.departments {
             if let depts = O2BizContactPickerResult.departments {
                 var allDept = ""
                 var allDept = ""
                 var target = ""
                 var target = ""
-                for dept in depts{
+                for dept in depts {
                     if allDept == "" {
                     if allDept == "" {
                         allDept = dept.name ?? ""
                         allDept = dept.name ?? ""
-                    }else{
-                        allDept = allDept + "," + ( dept.name ??  "" )
+                    } else {
+                        allDept = allDept + "," + (dept.name ?? "")
                     }
                     }
                     target = dept.distinguishedName ?? ""
                     target = dept.distinguishedName ?? ""
                 }
                 }
-                
+
                 self.calendarOrgField.text = allDept
                 self.calendarOrgField.text = allDept
                 self.calendarInfo?.target = target
                 self.calendarInfo?.target = target
             }
             }
@@ -257,29 +257,29 @@ class OOCalendarViewController: UITableViewController {
     }
     }
     //选择管理者
     //选择管理者
     @IBAction func selectManager(_ sender: Any) {
     @IBAction func selectManager(_ sender: Any) {
-        let  arrModes = [ContactPickerType.person]
-             showContactPicker(modes: arrModes, callback: {
-                 (O2BizContactPickerResult) in
-                if let users = O2BizContactPickerResult.users {
-                     var allUser = ""
-                     var manageablePersonList = [String]()
-                     for user in users{
-                         if allUser == "" {
-                             allUser = user.name ?? ""
-                         }else{
-                             allUser = allUser + "," + ( user.name ??  "" )
-                             
-                         }
-                        if let distinguishedName = user.distinguishedName{
-                               manageablePersonList.append(distinguishedName)
-                           }
-                     }
-                    self.calendarManagerField.text = allUser
-                    self.calendarInfo?.manageablePersonList = manageablePersonList
-                 }
-             })
-      }
-    
+        let arrModes = [ContactPickerType.person]
+        showContactPicker(modes: arrModes, callback: {
+            (O2BizContactPickerResult) in
+            if let users = O2BizContactPickerResult.users {
+                var allUser = ""
+                var manageablePersonList = [String]()
+                for user in users {
+                    if allUser == "" {
+                        allUser = user.name ?? ""
+                    } else {
+                        allUser = allUser + "," + (user.name ?? "")
+
+                    }
+                    if let distinguishedName = user.distinguishedName {
+                        manageablePersonList.append(distinguishedName)
+                    }
+                }
+                self.calendarManagerField.text = allUser
+                self.calendarInfo?.manageablePersonList = manageablePersonList
+            }
+        })
+    }
+
 
 
     //选择可见范围
     //选择可见范围
     @IBAction func selectScope(_ sender: Any) {
     @IBAction func selectScope(_ sender: Any) {
@@ -290,149 +290,149 @@ class OOCalendarViewController: UITableViewController {
         var viewablePersonList = [String]()
         var viewablePersonList = [String]()
         var viewableUnitList = [String]()
         var viewableUnitList = [String]()
         var viewableGroupList = [String]()
         var viewableGroupList = [String]()
-        let  arrModes = [ContactPickerType.person,ContactPickerType.unit,ContactPickerType.group]
+        let arrModes = [ContactPickerType.person, ContactPickerType.unit, ContactPickerType.group]
         showContactPicker(modes: arrModes, callback: {
         showContactPicker(modes: arrModes, callback: {
             (O2BizContactPickerResult) in
             (O2BizContactPickerResult) in
-           if let users = O2BizContactPickerResult.users {
-                for user in users{
+            if let users = O2BizContactPickerResult.users {
+                for user in users {
                     if allUser == "" {
                     if allUser == "" {
                         allUser = user.name ?? ""
                         allUser = user.name ?? ""
-                    }else{
-                        allUser = allUser + "," + ( user.name ??  "" )
+                    } else {
+                        allUser = allUser + "," + (user.name ?? "")
                     }
                     }
-                   if let distinguishedName = user.distinguishedName{
+                    if let distinguishedName = user.distinguishedName {
                         viewablePersonList.append(distinguishedName)
                         viewablePersonList.append(distinguishedName)
                     }
                     }
                 }
                 }
-              all = allUser
+                all = allUser
             }
             }
-            
+
             if let depts = O2BizContactPickerResult.departments {
             if let depts = O2BizContactPickerResult.departments {
-                for dept in depts{
+                for dept in depts {
                     if allDept == "" {
                     if allDept == "" {
                         allDept = dept.name ?? ""
                         allDept = dept.name ?? ""
-                    }else{
-                        allDept = allDept + "," + ( dept.name ??  "" )
+                    } else {
+                        allDept = allDept + "," + (dept.name ?? "")
                     }
                     }
-                    
-                  if let distinguishedName = dept.distinguishedName{
+
+                    if let distinguishedName = dept.distinguishedName {
                         viewableUnitList.append(distinguishedName)
                         viewableUnitList.append(distinguishedName)
-                  }
-                    
+                    }
+
                 }
                 }
                 if "" == all {
                 if "" == all {
-                    all =  allDept
-                 }else{
+                    all = allDept
+                } else {
                     if "" != allDept {
                     if "" != allDept {
-                      all = all + "," + allDept
+                        all = all + "," + allDept
                     }
                     }
                 }
                 }
             }
             }
-            
+
             if let groups = O2BizContactPickerResult.groups {
             if let groups = O2BizContactPickerResult.groups {
-                 for group in groups{
-                     if allGroup == "" {
-                         allGroup = group.name ?? ""
-                     }else{
-                         allGroup = allGroup + "," + (group.name ??  "" )
-                     }
-                    
-                    if let distinguishedName = group.distinguishedName{
-                          viewableGroupList.append(distinguishedName)
-                     }
-                 }
-                  if "" == all {
-                       all =  allGroup
-                    }else{
-                      if "" != allGroup {
-                         all = all + "," + allGroup
-                       }
+                for group in groups {
+                    if allGroup == "" {
+                        allGroup = group.name ?? ""
+                    } else {
+                        allGroup = allGroup + "," + (group.name ?? "")
+                    }
+
+                    if let distinguishedName = group.distinguishedName {
+                        viewableGroupList.append(distinguishedName)
                     }
                     }
                 }
                 }
-            
+                if "" == all {
+                    all = allGroup
+                } else {
+                    if "" != allGroup {
+                        all = all + "," + allGroup
+                    }
+                }
+            }
+
             self.calendarScopeField.text = all
             self.calendarScopeField.text = all
             self.calendarInfo?.viewablePersonList = viewablePersonList
             self.calendarInfo?.viewablePersonList = viewablePersonList
             self.calendarInfo?.viewableUnitList = viewableUnitList
             self.calendarInfo?.viewableUnitList = viewableUnitList
             self.calendarInfo?.viewableGroupList = viewableGroupList
             self.calendarInfo?.viewableGroupList = viewableGroupList
         })
         })
     }
     }
-    
+
     //可新建范围
     //可新建范围
     @IBAction func selectNewScope(_ sender: Any) {
     @IBAction func selectNewScope(_ sender: Any) {
-             var allUser = ""
-             var allDept = ""
-             var allGroup = ""
-             var all = ""
-             var publishablePersonList = [String]()
-             var publishableGroupList = [String]()
-             var publishableUnitList = [String]()
-             let  arrModes = [ContactPickerType.person,ContactPickerType.unit,ContactPickerType.group]
-             showContactPicker(modes: arrModes, callback: {
-                 (O2BizContactPickerResult) in
-                if let users = O2BizContactPickerResult.users {
-                     for user in users{
-                         if allUser == "" {
-                             allUser = user.name ?? ""
-                         }else{
-                             allUser = allUser + "," + ( user.name ??  "" )
-                        }
-                        
-                        if let distinguishedName = user.distinguishedName{
-                              publishablePersonList.append(distinguishedName)
-                        }
-                     }
-                   all = allUser
-                 }
-                 
-                 if let depts = O2BizContactPickerResult.departments {
-                     for dept in depts{
-                         if allDept == "" {
-                             allDept = dept.name ?? ""
-                         }else{
-                             allDept = allDept + "," + ( dept.name ??  "" )
-                         }
-                        
-                        if let distinguishedName = dept.distinguishedName{
-                              publishableUnitList.append(distinguishedName)
-                        }
-                     }
-                     if "" == all {
-                         all =  allDept
-                      }else{
-                        if "" != allDept {
-                          all = all + "," + allDept
-                        }
-                     }
-                 }
-                 
-                 if let groups = O2BizContactPickerResult.groups {
-                      for group in groups{
-                          if allGroup == "" {
-                              allGroup = group.name ?? ""
-                          }else{
-                              allGroup = allGroup + "," + (group.name ??  "" )
-                          }
-                        
-                        if let distinguishedName = group.distinguishedName{
-                              publishableGroupList.append(distinguishedName)
-                         }
-                      }
-                       if "" == all {
-                            all =  allGroup
-                         }else{
-                            if "" != allGroup{
-                               all = all + "," + allGroup
-                            }
-                         }
-                     }
-                self.calendarNewScopeField.text = all
-                self.calendarInfo?.publishablePersonList = publishablePersonList
-                self.calendarInfo?.publishableUnitList = publishableUnitList
-                self.calendarInfo?.publishableGroupList = publishableGroupList
-             })
+        var allUser = ""
+        var allDept = ""
+        var allGroup = ""
+        var all = ""
+        var publishablePersonList = [String]()
+        var publishableGroupList = [String]()
+        var publishableUnitList = [String]()
+        let arrModes = [ContactPickerType.person, ContactPickerType.unit, ContactPickerType.group]
+        showContactPicker(modes: arrModes, callback: {
+            (O2BizContactPickerResult) in
+            if let users = O2BizContactPickerResult.users {
+                for user in users {
+                    if allUser == "" {
+                        allUser = user.name ?? ""
+                    } else {
+                        allUser = allUser + "," + (user.name ?? "")
+                    }
+
+                    if let distinguishedName = user.distinguishedName {
+                        publishablePersonList.append(distinguishedName)
+                    }
+                }
+                all = allUser
+            }
+
+            if let depts = O2BizContactPickerResult.departments {
+                for dept in depts {
+                    if allDept == "" {
+                        allDept = dept.name ?? ""
+                    } else {
+                        allDept = allDept + "," + (dept.name ?? "")
+                    }
+
+                    if let distinguishedName = dept.distinguishedName {
+                        publishableUnitList.append(distinguishedName)
+                    }
+                }
+                if "" == all {
+                    all = allDept
+                } else {
+                    if "" != allDept {
+                        all = all + "," + allDept
+                    }
+                }
+            }
+
+            if let groups = O2BizContactPickerResult.groups {
+                for group in groups {
+                    if allGroup == "" {
+                        allGroup = group.name ?? ""
+                    } else {
+                        allGroup = allGroup + "," + (group.name ?? "")
+                    }
+
+                    if let distinguishedName = group.distinguishedName {
+                        publishableGroupList.append(distinguishedName)
+                    }
+                }
+                if "" == all {
+                    all = allGroup
+                } else {
+                    if "" != allGroup {
+                        all = all + "," + allGroup
+                    }
+                }
+            }
+            self.calendarNewScopeField.text = all
+            self.calendarInfo?.publishablePersonList = publishablePersonList
+            self.calendarInfo?.publishableUnitList = publishableUnitList
+            self.calendarInfo?.publishableGroupList = publishableGroupList
+        })
     }
     }
 
 
-    
+
     private func loadCalendarInfoFromNet() {
     private func loadCalendarInfoFromNet() {
         viewModel.getCalendar(id: (calendarInfo?.id)!)
         viewModel.getCalendar(id: (calendarInfo?.id)!)
             .then { (calendar) in
             .then { (calendar) in
@@ -441,63 +441,63 @@ class OOCalendarViewController: UITableViewController {
                 DDLogError("查询日历信息出错,\(error.localizedDescription)")
                 DDLogError("查询日历信息出错,\(error.localizedDescription)")
         }
         }
     }
     }
-    
+
     private func updateStuffValue(calendar: OOCalendarInfo) {
     private func updateStuffValue(calendar: OOCalendarInfo) {
-          calendarNameField.text = calendar.name
-    
-          if calendar.type == "UNIT" {
-              self.count = 4;
-          }else{
-              self.count = 0;
-          }
-          let section = NSIndexSet(index: 1)
-          self.tableView.beginUpdates()
-          self.tableView.reloadSections(section as IndexSet, with: .automatic)
-          self.tableView.endUpdates()
-          //所属组织
-          calendarOrgField.text = calendar.target?.getChinaName()
-          //管理员
-          calendarManagerField.text = calendar.manageablePersonList?.getChinaName().joined(separator: ",")
-          
-          //可见范围
-         var viewablePersonList = [String]()
-          viewablePersonList += calendar.viewablePersonList ?? []
-          viewablePersonList += calendar.viewableUnitList ?? []
-          viewablePersonList += calendar.viewableGroupList ?? []
-          calendarScopeField.text = viewablePersonList.getChinaName().joined(separator: ",")
-          
-          //可新建范围
-          var publishableList = [String]()
-          publishableList += calendar.publishablePersonList ?? []
-          publishableList += calendar.publishableGroupList ?? []
-          publishableList += calendar.publishableUnitList ?? []
-          calendarNewScopeField.text = publishableList.getChinaName().joined(separator: ",")
-          
-          if calendar.type == "PERSON" {
-               calendarTypeField.text = "个人日历"
-          }else{
-               calendarTypeField.text = "组织日历"
-          }
-         
-          calendarStatusSwitch.setOn(calendar.status=="OPEN", animated: true)
-          calendarIsOpenSwitch.setOn(calendar.isPublic == true, animated: true)
-          //隐藏类型选择按钮
-          calendarIsOpenBtn.isHidden = true
-          
-          if let color = calendar.color {
-              if let index = colorOptions.index(where: { (colorItem) -> Bool in
-                  return colorItem == color
-              }) {
-                  self.selectColorView(tag: index)
-              }
-          }
-          
-          calendarRemarkField.text = calendar.desc
-      }
-
-    
-
-    
+        calendarNameField.text = calendar.name
+
+        if calendar.type == "UNIT" {
+            self.count = 4;
+        } else {
+            self.count = 0;
+        }
+        let section = NSIndexSet(index: 1)
+        self.tableView.beginUpdates()
+        self.tableView.reloadSections(section as IndexSet, with: .automatic)
+        self.tableView.endUpdates()
+        //所属组织
+        calendarOrgField.text = calendar.target?.getChinaName()
+        //管理员
+        calendarManagerField.text = calendar.manageablePersonList?.getChinaName().joined(separator: ",")
+
+        //可见范围
+        var viewablePersonList = [String]()
+        viewablePersonList += calendar.viewablePersonList ?? []
+        viewablePersonList += calendar.viewableUnitList ?? []
+        viewablePersonList += calendar.viewableGroupList ?? []
+        calendarScopeField.text = viewablePersonList.getChinaName().joined(separator: ",")
+
+        //可新建范围
+        var publishableList = [String]()
+        publishableList += calendar.publishablePersonList ?? []
+        publishableList += calendar.publishableGroupList ?? []
+        publishableList += calendar.publishableUnitList ?? []
+        calendarNewScopeField.text = publishableList.getChinaName().joined(separator: ",")
+
+        if calendar.type == "PERSON" {
+            calendarTypeField.text = "个人日历"
+        } else {
+            calendarTypeField.text = "组织日历"
+        }
+
+        calendarStatusSwitch.setOn(calendar.status == "OPEN", animated: true)
+        calendarIsOpenSwitch.setOn(calendar.isPublic == true, animated: true)
+        //隐藏类型选择按钮
+        calendarIsOpenBtn.isHidden = true
+
+        if let color = calendar.color {
+            if let index = colorOptions.index(where: { (colorItem) -> Bool in
+                return colorItem == color
+            }) {
+                self.selectColorView(tag: index)
+            }
+        }
+
+        calendarRemarkField.text = calendar.desc
+    }
+
+
+
+
     private func closeWindow() {
     private func closeWindow() {
         self.navigationController?.popViewController(animated: true)
         self.navigationController?.popViewController(animated: true)
     }
     }
@@ -524,22 +524,22 @@ class OOCalendarViewController: UITableViewController {
 }
 }
 
 
 extension OOCalendarViewController: UITextFieldDelegate {
 extension OOCalendarViewController: UITextFieldDelegate {
-    func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool{
-        if let Identifier = textField.accessibilityIdentifier{
+    func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
+        if let Identifier = textField.accessibilityIdentifier {
             if Identifier == "calendarType" {
             if Identifier == "calendarType" {
                 return false
                 return false
-            } else{
+            } else {
                 return true
                 return true
             }
             }
-        }else{
+        } else {
             return true
             return true
         }
         }
     }
     }
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         //return textField.resignFirstResponder()
         //return textField.resignFirstResponder()
         let res = textField.resignFirstResponder()
         let res = textField.resignFirstResponder()
-        return  false
-      
+        return false
+
     }
     }
 
 
 }
 }

+ 1510 - 1428
o2ios/O2Platform/App/Calendar-日程管理/calendar.storyboard

@@ -1,1438 +1,1520 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="tKt-3P-uQz">
-  <device id="retina4_7" orientation="portrait" appearance="light"/>
-  <dependencies>
-    <deployment identifier="iOS"/>
-    <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
-    <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-    <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-  </dependencies>
-  <scenes>
-    <!--Calendar Main Month View Controller-->
-    <scene sceneID="g48-mo-Kla">
-      <objects>
-        <viewController id="xYY-yG-JGa" customClass="OOCalendarMainMonthViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <view key="view" contentMode="scaleToFill" id="QKO-bs-p7W">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-              <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KJj-zi-dZB">
-                <rect key="frame" x="0.0" y="44" width="375" height="583"/>
-                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                <prototypes>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="CalendarEventCell" id="n53-PB-sk0" customClass="CalendarEventTableViewCell" customModule="O2Platform" customModuleProvider="target">
-                    <rect key="frame" x="0.0" y="28" width="375" height="43.5"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="monthCalendarContent" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="n53-PB-sk0" id="lyc-3f-O6N">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JXL-RY-KpG">
-                          <rect key="frame" x="18" y="13" width="18" height="18"/>
-                          <color key="backgroundColor" red="0.29803921570000003" green="0.68627450980000004" blue="0.31372549020000001" alpha="1" colorSpace="calibratedRGB"/>
-                          <constraints>
-                            <constraint firstAttribute="width" constant="18" id="9R9-Im-fh5"/>
-                            <constraint firstAttribute="height" constant="18" id="bNg-p4-EmP"/>
-                          </constraints>
-                        </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="这里是内容" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YuP-80-oar">
-                          <rect key="frame" x="44" y="11.5" width="263" height="20.5"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                          <nil key="textColor"/>
-                          <nil key="highlightedColor"/>
-                        </label>
-                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2ui-5h-ZC7">
-                          <rect key="frame" x="315" y="5" width="42" height="34"/>
-                          <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="18:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="les-0j-Mxf" userLabel="Event StartTime">
-                              <rect key="frame" x="5" y="0.0" width="32" height="14.5"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="19:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jIB-o0-arB" userLabel="Event EndTime">
-                              <rect key="frame" x="5" y="19.5" width="32" height="14.5"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              <nil key="highlightedColor"/>
-                            </label>
-                          </subviews>
-                          <constraints>
-                            <constraint firstAttribute="width" constant="42" id="r9t-sb-ycD"/>
-                          </constraints>
-                        </stackView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全天" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KIV-kE-cmY" userLabel="Event AllDay">
-                          <rect key="frame" x="326" y="13" width="31" height="18"/>
-                          <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
-                          <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                          <nil key="highlightedColor"/>
-                        </label>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="2ui-5h-ZC7" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="1JL-Dp-A6W"/>
-                        <constraint firstItem="JXL-RY-KpG" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="Ibd-e8-GXJ"/>
-                        <constraint firstItem="YuP-80-oar" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="QdU-mY-k9o"/>
-                        <constraint firstItem="2ui-5h-ZC7" firstAttribute="leading" secondItem="YuP-80-oar" secondAttribute="trailing" constant="8" id="V6b-cg-chx"/>
-                        <constraint firstItem="JXL-RY-KpG" firstAttribute="leading" secondItem="lyc-3f-O6N" secondAttribute="leading" constant="18" id="dSx-3I-cxQ"/>
-                        <constraint firstAttribute="trailing" secondItem="2ui-5h-ZC7" secondAttribute="trailing" constant="18" id="fwY-HU-g8c"/>
-                        <constraint firstItem="YuP-80-oar" firstAttribute="leading" secondItem="JXL-RY-KpG" secondAttribute="trailing" constant="8" id="kgr-jn-t9O"/>
-                        <constraint firstAttribute="trailing" secondItem="KIV-kE-cmY" secondAttribute="trailing" constant="18" id="mam-ns-u2j"/>
-                        <constraint firstItem="KIV-kE-cmY" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="rH1-jv-JMV"/>
-                      </constraints>
-                    </tableViewCellContentView>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="tKt-3P-uQz">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Calendar Main Month View Controller-->
+        <scene sceneID="g48-mo-Kla">
+            <objects>
+                <viewController id="xYY-yG-JGa" customClass="OOCalendarMainMonthViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="QKO-bs-p7W">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="KJj-zi-dZB">
+                                <rect key="frame" x="0.0" y="44" width="375" height="583"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <prototypes>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="CalendarEventCell" id="n53-PB-sk0" customClass="CalendarEventTableViewCell" customModule="O2Platform" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="43.5"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" restorationIdentifier="monthCalendarContent" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="n53-PB-sk0" id="lyc-3f-O6N">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JXL-RY-KpG">
+                                                    <rect key="frame" x="18" y="13" width="18" height="18"/>
+                                                    <color key="backgroundColor" red="0.29803921570000003" green="0.68627450980000004" blue="0.31372549020000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="18" id="9R9-Im-fh5"/>
+                                                        <constraint firstAttribute="height" constant="18" id="bNg-p4-EmP"/>
+                                                    </constraints>
+                                                </view>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="这里是内容" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YuP-80-oar">
+                                                    <rect key="frame" x="44" y="11.5" width="263" height="20.5"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" alignment="center" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="2ui-5h-ZC7">
+                                                    <rect key="frame" x="315" y="5" width="42" height="34"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="18:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="les-0j-Mxf" userLabel="Event StartTime">
+                                                            <rect key="frame" x="5" y="0.0" width="32" height="14.5"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="19:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jIB-o0-arB" userLabel="Event EndTime">
+                                                            <rect key="frame" x="5" y="19.5" width="32" height="14.5"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="42" id="r9t-sb-ycD"/>
+                                                    </constraints>
+                                                </stackView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全天" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KIV-kE-cmY" userLabel="Event AllDay">
+                                                    <rect key="frame" x="326" y="13" width="31" height="18"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
+                                                    <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="2ui-5h-ZC7" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="1JL-Dp-A6W"/>
+                                                <constraint firstItem="JXL-RY-KpG" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="Ibd-e8-GXJ"/>
+                                                <constraint firstItem="YuP-80-oar" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="QdU-mY-k9o"/>
+                                                <constraint firstItem="2ui-5h-ZC7" firstAttribute="leading" secondItem="YuP-80-oar" secondAttribute="trailing" constant="8" id="V6b-cg-chx"/>
+                                                <constraint firstItem="JXL-RY-KpG" firstAttribute="leading" secondItem="lyc-3f-O6N" secondAttribute="leading" constant="18" id="dSx-3I-cxQ"/>
+                                                <constraint firstAttribute="trailing" secondItem="2ui-5h-ZC7" secondAttribute="trailing" constant="18" id="fwY-HU-g8c"/>
+                                                <constraint firstItem="YuP-80-oar" firstAttribute="leading" secondItem="JXL-RY-KpG" secondAttribute="trailing" constant="8" id="kgr-jn-t9O"/>
+                                                <constraint firstAttribute="trailing" secondItem="KIV-kE-cmY" secondAttribute="trailing" constant="18" id="mam-ns-u2j"/>
+                                                <constraint firstItem="KIV-kE-cmY" firstAttribute="centerY" secondItem="lyc-3f-O6N" secondAttribute="centerY" id="rH1-jv-JMV"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                        <connections>
+                                            <outlet property="eventAllDay" destination="KIV-kE-cmY" id="34j-Xs-8z2"/>
+                                            <outlet property="eventColorView" destination="JXL-RY-KpG" id="FzI-2i-OMO"/>
+                                            <outlet property="eventEndTime" destination="jIB-o0-arB" id="TDp-Ag-gq3"/>
+                                            <outlet property="eventStartTime" destination="les-0j-Mxf" id="eJA-Fg-C5K"/>
+                                            <outlet property="eventTimeStack" destination="2ui-5h-ZC7" id="RcE-jB-uZq"/>
+                                            <outlet property="eventTitleView" destination="YuP-80-oar" id="GaE-LI-V7N"/>
+                                            <segue destination="Vxk-45-vB1" kind="show" identifier="showEventDetail" id="VOH-7P-zaY"/>
+                                        </connections>
+                                    </tableViewCell>
+                                </prototypes>
+                            </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M0F-7m-vuY" userLabel="BottomBar">
+                                <rect key="frame" x="0.0" y="627" width="375" height="40"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-wW-6mZ">
+                                        <rect key="frame" x="16" y="3.5" width="35" height="33"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                        <state key="normal" title="今天"/>
+                                        <connections>
+                                            <action selector="todayAction:" destination="xYY-yG-JGa" eventType="touchUpInside" id="Wd8-Ne-Gwr"/>
+                                        </connections>
+                                    </button>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="71T-qf-T8Z">
+                                        <rect key="frame" x="324" y="3.5" width="35" height="33"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                        <state key="normal" title="日历"/>
+                                        <connections>
+                                            <segue destination="L5W-fh-UuH" kind="show" id="DF4-xt-Rlu"/>
+                                        </connections>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" red="0.97647058823529409" green="0.97647058823529409" blue="0.97647058823529409" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="EPO-5J-aQ8"/>
+                                    <constraint firstItem="wt1-wW-6mZ" firstAttribute="leading" secondItem="M0F-7m-vuY" secondAttribute="leading" constant="16" id="aoT-z2-Iuk"/>
+                                    <constraint firstAttribute="trailing" secondItem="71T-qf-T8Z" secondAttribute="trailing" constant="16" id="bQo-4L-Bhv"/>
+                                    <constraint firstItem="wt1-wW-6mZ" firstAttribute="centerY" secondItem="M0F-7m-vuY" secondAttribute="centerY" id="opA-fa-ziv"/>
+                                    <constraint firstItem="71T-qf-T8Z" firstAttribute="centerY" secondItem="M0F-7m-vuY" secondAttribute="centerY" id="ufw-UJ-60Y"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="M0F-7m-vuY" firstAttribute="bottom" secondItem="YOP-fD-eOB" secondAttribute="bottom" id="1g7-OC-yaV"/>
+                            <constraint firstItem="KJj-zi-dZB" firstAttribute="leading" secondItem="YOP-fD-eOB" secondAttribute="leading" id="8Bi-5G-lvJ"/>
+                            <constraint firstItem="M0F-7m-vuY" firstAttribute="top" secondItem="KJj-zi-dZB" secondAttribute="bottom" id="AIF-zg-ryj"/>
+                            <constraint firstItem="KJj-zi-dZB" firstAttribute="trailing" secondItem="YOP-fD-eOB" secondAttribute="trailing" id="MLm-Tk-l38"/>
+                            <constraint firstItem="M0F-7m-vuY" firstAttribute="trailing" secondItem="YOP-fD-eOB" secondAttribute="trailing" id="dJ4-wm-Y8z"/>
+                            <constraint firstItem="M0F-7m-vuY" firstAttribute="leading" secondItem="YOP-fD-eOB" secondAttribute="leading" id="kLc-Qp-gzN"/>
+                            <constraint firstItem="KJj-zi-dZB" firstAttribute="top" secondItem="YOP-fD-eOB" secondAttribute="top" id="plZ-2M-2pz"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="YOP-fD-eOB"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="4qR-Bd-8HM"/>
                     <connections>
                     <connections>
-                      <outlet property="eventAllDay" destination="KIV-kE-cmY" id="34j-Xs-8z2"/>
-                      <outlet property="eventColorView" destination="JXL-RY-KpG" id="FzI-2i-OMO"/>
-                      <outlet property="eventEndTime" destination="jIB-o0-arB" id="TDp-Ag-gq3"/>
-                      <outlet property="eventStartTime" destination="les-0j-Mxf" id="eJA-Fg-C5K"/>
-                      <outlet property="eventTimeStack" destination="2ui-5h-ZC7" id="RcE-jB-uZq"/>
-                      <outlet property="eventTitleView" destination="YuP-80-oar" id="GaE-LI-V7N"/>
-                      <segue destination="Vxk-45-vB1" kind="show" identifier="showEventDetail" id="VOH-7P-zaY"/>
+                        <outlet property="calendarBtn" destination="71T-qf-T8Z" id="kmy-qp-47B"/>
+                        <outlet property="tableView" destination="KJj-zi-dZB" id="BLE-0u-ldM"/>
+                        <outlet property="todayBtn" destination="wt1-wW-6mZ" id="oTj-Yv-omZ"/>
                     </connections>
                     </connections>
-                  </tableViewCell>
-                </prototypes>
-              </tableView>
-              <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M0F-7m-vuY" userLabel="BottomBar">
-                <rect key="frame" x="0.0" y="627" width="375" height="40"/>
-                <subviews>
-                  <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wt1-wW-6mZ">
-                    <rect key="frame" x="16" y="3.5" width="35" height="33"/>
-                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                    <state key="normal" title="今天"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="NFS-3Q-UWF" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="848.79999999999995" y="-694.00299850074964"/>
+        </scene>
+        <!--Calendar Event View Controller-->
+        <scene sceneID="Aj2-RD-S3x">
+            <objects>
+                <tableViewController id="Vxk-45-vB1" customClass="OOCalendarEventViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="7H1-7C-M3e">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <sections>
+                            <tableViewSection id="Ogn-vO-7jG">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="45" id="uxG-oP-2Jx">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="45"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uxG-oP-2Jx" id="MKv-co-tJv">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="例如:开会" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gaP-Lw-V7E">
+                                                    <rect key="frame" x="16" y="5" width="354" height="35"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="gaP-Lw-V7E" firstAttribute="top" secondItem="MKv-co-tJv" secondAttribute="top" constant="5" id="Umh-GC-vHb"/>
+                                                <constraint firstAttribute="bottom" secondItem="gaP-Lw-V7E" secondAttribute="bottom" constant="5" id="aYp-Fg-OyP"/>
+                                                <constraint firstItem="gaP-Lw-V7E" firstAttribute="leading" secondItem="MKv-co-tJv" secondAttribute="leading" constant="16" id="szc-Rj-gp8"/>
+                                                <constraint firstAttribute="trailing" secondItem="gaP-Lw-V7E" secondAttribute="trailing" constant="5" id="uFD-7h-XoM"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="120" id="Nqb-uU-RgB">
+                                        <rect key="frame" x="0.0" y="73" width="375" height="120"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Nqb-uU-RgB" id="PQX-mp-zBS">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="lpS-Ep-u9o">
+                                                    <rect key="frame" x="16" y="5" width="100" height="24"/>
+                                                    <subviews>
+                                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="PwN-cV-5Cp">
+                                                            <rect key="frame" x="0.0" y="0.0" width="50" height="24"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="48" id="Cy3-uM-ruq"/>
+                                                                <constraint firstAttribute="height" constant="24" id="VCr-I8-jVq"/>
+                                                            </constraints>
+                                                            <connections>
+                                                                <action selector="tapAllDaySwitch:" destination="Vxk-45-vB1" eventType="valueChanged" id="rrC-lO-H2n"/>
+                                                            </connections>
+                                                        </switch>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全天" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rdY-4r-1NV">
+                                                            <rect key="frame" x="63" y="0.0" width="37" height="24"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="100" id="s4W-o2-CN4"/>
+                                                    </constraints>
+                                                </stackView>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_shijian" translatesAutoresizingMaskIntoConstraints="NO" id="sfg-C9-T2u">
+                                                    <rect key="frame" x="16" y="45" width="22" height="22"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="22" id="6WJ-71-uTo"/>
+                                                        <constraint firstAttribute="height" constant="22" id="9gU-gy-aua"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="NNc-Zq-e8a">
+                                                    <rect key="frame" x="74" y="46" width="285" height="64"/>
+                                                    <subviews>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HqM-sQ-xhn">
+                                                            <rect key="frame" x="0.0" y="0.0" width="285" height="22"/>
+                                                            <subviews>
+                                                                <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年07月30日 13:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dub-8d-dx7">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="261" height="22"/>
+                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="23o-Vb-7fY">
+                                                                    <rect key="frame" x="261" y="0.0" width="24" height="22"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="24" id="HAj-Bt-7rV"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                        <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lNF-vK-WbX">
+                                                            <rect key="frame" x="0.0" y="42" width="285" height="22"/>
+                                                            <subviews>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年07月30日 13:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rqe-Vw-UzF">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="261" height="22"/>
+                                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                                    <nil key="textColor"/>
+                                                                    <nil key="highlightedColor"/>
+                                                                </label>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="y7l-as-AD6">
+                                                                    <rect key="frame" x="261" y="0.0" width="24" height="22"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="24" id="sMs-sB-hyI"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                        </stackView>
+                                                    </subviews>
+                                                    <gestureRecognizers/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="64" id="S4m-1J-ydh"/>
+                                                    </constraints>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="NNc-Zq-e8a" firstAttribute="leading" secondItem="sfg-C9-T2u" secondAttribute="trailing" constant="36" id="am8-ML-krx"/>
+                                                <constraint firstItem="lpS-Ep-u9o" firstAttribute="top" secondItem="PQX-mp-zBS" secondAttribute="top" constant="5" id="c3D-PO-yJC"/>
+                                                <constraint firstItem="sfg-C9-T2u" firstAttribute="leading" secondItem="PQX-mp-zBS" secondAttribute="leadingMargin" id="dds-UT-Ghg"/>
+                                                <constraint firstItem="sfg-C9-T2u" firstAttribute="top" secondItem="lpS-Ep-u9o" secondAttribute="bottom" constant="16" id="kcR-EW-imZ"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="NNc-Zq-e8a" secondAttribute="trailing" id="pmh-Pn-TSi"/>
+                                                <constraint firstItem="lpS-Ep-u9o" firstAttribute="leading" secondItem="PQX-mp-zBS" secondAttribute="leading" constant="16" id="s0k-x8-Y6F"/>
+                                                <constraint firstItem="NNc-Zq-e8a" firstAttribute="top" secondItem="lpS-Ep-u9o" secondAttribute="bottom" constant="17" id="vUd-A0-kwF"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="60" id="4Gg-JY-9Yo">
+                                        <rect key="frame" x="0.0" y="193" width="375" height="60"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4Gg-JY-9Yo" id="7Su-0t-5EZ">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="evq-G0-rF6">
+                                                    <rect key="frame" x="16" y="0.0" width="341" height="60"/>
+                                                    <subviews>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_hdjr" translatesAutoresizingMaskIntoConstraints="NO" id="kBX-9l-V1q">
+                                                            <rect key="frame" x="0.0" y="19" width="22" height="22"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="22" id="1FT-SO-P9R"/>
+                                                                <constraint firstAttribute="height" constant="22" id="rqM-2X-wbT"/>
+                                                            </constraints>
+                                                        </imageView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d6a-1J-M0C">
+                                                            <rect key="frame" x="37" y="5" width="265" height="50"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="mLE-bR-oAU">
+                                                            <rect key="frame" x="317" y="18" width="24" height="24"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="24" id="BTZ-58-gvV"/>
+                                                                <constraint firstAttribute="height" constant="24" id="PPb-VV-STu"/>
+                                                            </constraints>
+                                                        </imageView>
+                                                    </subviews>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="evq-G0-rF6" firstAttribute="top" secondItem="7Su-0t-5EZ" secondAttribute="top" id="1VO-mL-jHa"/>
+                                                <constraint firstItem="evq-G0-rF6" firstAttribute="leading" secondItem="7Su-0t-5EZ" secondAttribute="leading" constant="16" id="h8s-cf-9Sd"/>
+                                                <constraint firstAttribute="trailing" secondItem="evq-G0-rF6" secondAttribute="trailing" constant="18" id="oUj-3c-7gc"/>
+                                                <constraint firstAttribute="bottom" secondItem="evq-G0-rF6" secondAttribute="bottom" id="uSr-V1-QZu"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="45" id="qQX-Lv-NHQ">
+                                        <rect key="frame" x="0.0" y="253" width="375" height="45"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qQX-Lv-NHQ" id="Tln-Ch-B5c">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="i8o-dB-E0v">
+                                                    <rect key="frame" x="20" y="8" width="339" height="29"/>
+                                                    <subviews>
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dgr-Bu-MAQ" userLabel="blue">
+                                                            <rect key="frame" x="0.0" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="gmX-mE-SDk">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="6VV-qr-hlC"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="Uxh-wh-1YZ"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.25882352941176467" green="0.5607843137254902" blue="0.9882352941176471" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="gmX-mE-SDk" firstAttribute="centerX" secondItem="Dgr-Bu-MAQ" secondAttribute="centerX" id="9aJ-c0-KjP"/>
+                                                                <constraint firstAttribute="width" constant="24" id="Ivw-Nt-e8L"/>
+                                                                <constraint firstItem="gmX-mE-SDk" firstAttribute="centerY" secondItem="Dgr-Bu-MAQ" secondAttribute="centerY" id="Y6X-EZ-SM0"/>
+                                                                <constraint firstAttribute="height" constant="24" id="aY4-rA-in7"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nS3-qA-VwA" userLabel="green">
+                                                            <rect key="frame" x="45" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="D3N-kh-Mq7">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="WOI-Ze-YEg"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="ZQ2-1O-AN1"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.35686274509803922" green="0.80000000000000004" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="D3N-kh-Mq7" firstAttribute="centerY" secondItem="nS3-qA-VwA" secondAttribute="centerY" id="8BK-XT-xJE"/>
+                                                                <constraint firstAttribute="width" constant="24" id="SRZ-Rw-NfW"/>
+                                                                <constraint firstAttribute="height" constant="24" id="kPY-21-Y5A"/>
+                                                                <constraint firstItem="D3N-kh-Mq7" firstAttribute="centerX" secondItem="nS3-qA-VwA" secondAttribute="centerX" id="ltQ-jl-c7u"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hRM-n9-khc" userLabel="orangle">
+                                                            <rect key="frame" x="90" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="KzE-S1-77g">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="AUe-S7-hB3"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="aFI-ew-wtP"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.97647058823529409" green="0.74901960784313726" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="KzE-S1-77g" firstAttribute="centerY" secondItem="hRM-n9-khc" secondAttribute="centerY" id="HEF-qz-tnK"/>
+                                                                <constraint firstAttribute="height" constant="24" id="HQu-84-yYi"/>
+                                                                <constraint firstItem="KzE-S1-77g" firstAttribute="centerX" secondItem="hRM-n9-khc" secondAttribute="centerX" id="ceb-An-1Tu"/>
+                                                                <constraint firstAttribute="width" constant="24" id="mck-HZ-ZCw"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ggx-2y-fDS" userLabel="crimson">
+                                                            <rect key="frame" x="135" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="GK6-ih-mWE">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="ae3-zr-8aw"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="w5l-GX-PJI"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.96862745098039216" green="0.37254901960784315" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="24" id="UMl-J7-DNy"/>
+                                                                <constraint firstItem="GK6-ih-mWE" firstAttribute="centerX" secondItem="Ggx-2y-fDS" secondAttribute="centerX" id="bXf-5U-QEv"/>
+                                                                <constraint firstAttribute="height" constant="24" id="hfe-b7-39J"/>
+                                                                <constraint firstItem="GK6-ih-mWE" firstAttribute="centerY" secondItem="Ggx-2y-fDS" secondAttribute="centerY" id="w1I-Sz-h3c"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OGU-7P-pbj" userLabel="lightpurple">
+                                                            <rect key="frame" x="180" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="yE3-0X-Ixh">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="18" id="ARI-92-xj5"/>
+                                                                        <constraint firstAttribute="height" constant="18" id="Rnx-ld-gJh"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.94509803921568625" green="0.50196078431372548" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="yE3-0X-Ixh" firstAttribute="centerY" secondItem="OGU-7P-pbj" secondAttribute="centerY" id="782-Qj-Dlk"/>
+                                                                <constraint firstAttribute="width" constant="24" id="Fv9-El-C1c"/>
+                                                                <constraint firstAttribute="height" constant="24" id="HVA-E8-C61"/>
+                                                                <constraint firstItem="yE3-0X-Ixh" firstAttribute="centerX" secondItem="OGU-7P-pbj" secondAttribute="centerX" id="dqb-xX-kM8"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H7n-vf-H9J" userLabel="purple">
+                                                            <rect key="frame" x="225" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="D0E-yX-QaI">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="TFo-D4-GPF"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="iAL-KH-v80"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.56470588235294117" green="0.44705882352941173" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="24" id="8gq-CO-eTY"/>
+                                                                <constraint firstItem="D0E-yX-QaI" firstAttribute="centerY" secondItem="H7n-vf-H9J" secondAttribute="centerY" id="99s-cw-T7m"/>
+                                                                <constraint firstAttribute="width" constant="24" id="E8S-ZW-5fe"/>
+                                                                <constraint firstItem="D0E-yX-QaI" firstAttribute="centerX" secondItem="H7n-vf-H9J" secondAttribute="centerX" id="sRT-G7-gp6"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="118-Aw-aif" userLabel="gray">
+                                                            <rect key="frame" x="270" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="8UA-Zc-sdH">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="J8p-K5-Xsp"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="KUz-t8-9b4"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.56470588235294117" green="0.56470588235294117" blue="0.56470588235294117" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="8UA-Zc-sdH" firstAttribute="centerY" secondItem="118-Aw-aif" secondAttribute="centerY" id="5PU-ld-WL6"/>
+                                                                <constraint firstAttribute="height" constant="24" id="EoQ-gB-JFa"/>
+                                                                <constraint firstAttribute="width" constant="24" id="gYN-JO-57r"/>
+                                                                <constraint firstItem="8UA-Zc-sdH" firstAttribute="centerX" secondItem="118-Aw-aif" secondAttribute="centerX" id="lfI-fD-zeO"/>
+                                                            </constraints>
+                                                        </view>
+                                                        <view tag="7" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aua-TK-Qnv" userLabel="cyanine">
+                                                            <rect key="frame" x="315" y="2.5" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="tye-Jf-YHm">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="5WS-2e-3QG"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="mHx-1M-qnT"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.078431372549019607" green="0.38431372549019605" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="24" id="4nx-sl-RIa"/>
+                                                                <constraint firstAttribute="height" constant="24" id="Kpb-lJ-sTI"/>
+                                                                <constraint firstItem="tye-Jf-YHm" firstAttribute="centerY" secondItem="aua-TK-Qnv" secondAttribute="centerY" id="cKv-Ul-QD0"/>
+                                                                <constraint firstItem="tye-Jf-YHm" firstAttribute="centerX" secondItem="aua-TK-Qnv" secondAttribute="centerX" id="cYE-GL-WBJ"/>
+                                                            </constraints>
+                                                        </view>
+                                                    </subviews>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="i8o-dB-E0v" secondAttribute="trailing" constant="16" id="8Ox-ef-kQX"/>
+                                                <constraint firstAttribute="bottom" secondItem="i8o-dB-E0v" secondAttribute="bottom" constant="8" id="Zut-5K-hJS"/>
+                                                <constraint firstItem="i8o-dB-E0v" firstAttribute="leading" secondItem="Tln-Ch-B5c" secondAttribute="leading" constant="20" id="iT4-S9-mfI"/>
+                                                <constraint firstItem="i8o-dB-E0v" firstAttribute="top" secondItem="Tln-Ch-B5c" secondAttribute="top" constant="8" id="lBf-sr-HQW"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="60" id="u6G-MU-dPL">
+                                        <rect key="frame" x="0.0" y="298" width="375" height="60"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="u6G-MU-dPL" id="auw-zx-G07">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Nvw-Uv-y4F">
+                                                    <rect key="frame" x="16" y="0.0" width="341" height="60"/>
+                                                    <subviews>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_tixing" translatesAutoresizingMaskIntoConstraints="NO" id="JPO-Kb-7YE">
+                                                            <rect key="frame" x="0.0" y="19" width="22" height="22"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="22" id="XHQ-Ne-kEe"/>
+                                                                <constraint firstAttribute="height" constant="22" id="i2w-Kk-1a1"/>
+                                                            </constraints>
+                                                        </imageView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wt4-bF-zw0">
+                                                            <rect key="frame" x="37" y="5" width="265" height="50"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="HrV-pt-ReD">
+                                                            <rect key="frame" x="317" y="18" width="24" height="24"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="24" id="BY7-pJ-aHf"/>
+                                                                <constraint firstAttribute="height" constant="24" id="SqL-ym-P0L"/>
+                                                            </constraints>
+                                                        </imageView>
+                                                    </subviews>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="Nvw-Uv-y4F" firstAttribute="top" secondItem="auw-zx-G07" secondAttribute="top" id="BS2-oE-3V6"/>
+                                                <constraint firstAttribute="bottom" secondItem="Nvw-Uv-y4F" secondAttribute="bottom" id="S9Y-Ea-NPh"/>
+                                                <constraint firstAttribute="trailing" secondItem="Nvw-Uv-y4F" secondAttribute="trailing" constant="18" id="mVM-zG-UZP"/>
+                                                <constraint firstItem="Nvw-Uv-y4F" firstAttribute="leading" secondItem="auw-zx-G07" secondAttribute="leading" constant="16" id="oXw-gx-pWs"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="60" id="e5P-Ds-0Jm">
+                                        <rect key="frame" x="0.0" y="358" width="375" height="60"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e5P-Ds-0Jm" id="vBL-Zg-uX0">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="o2n-Cg-nQo">
+                                                    <rect key="frame" x="16" y="0.0" width="341" height="60"/>
+                                                    <subviews>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_chongfu" translatesAutoresizingMaskIntoConstraints="NO" id="W5r-qL-MRy">
+                                                            <rect key="frame" x="0.0" y="19" width="22" height="22"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="22" id="eN6-V0-CcT"/>
+                                                                <constraint firstAttribute="width" constant="22" id="mxs-yb-OVM"/>
+                                                            </constraints>
+                                                        </imageView>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WGv-Yu-hGd">
+                                                            <rect key="frame" x="37" y="5" width="265" height="50"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="Q5b-ni-gRS">
+                                                            <rect key="frame" x="317" y="18" width="24" height="24"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="24" id="c9n-dF-gAK"/>
+                                                                <constraint firstAttribute="height" constant="24" id="sWp-6m-lW9"/>
+                                                            </constraints>
+                                                        </imageView>
+                                                    </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="60" id="gjT-w1-VIx"/>
+                                                    </constraints>
+                                                </stackView>
+                                                <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="F44-6G-rM2">
+                                                    <rect key="frame" x="32" y="65" width="311" height="20"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="截至日期:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMf-BA-twt">
+                                                            <rect key="frame" x="0.0" y="3" width="64" height="14.5"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="64" id="oup-D2-hLu"/>
+                                                            </constraints>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <nil key="textColor"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k6W-yh-OR2">
+                                                            <rect key="frame" x="79" y="0.0" width="232" height="20"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                    </subviews>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="20" id="iwQ-Pk-1HS"/>
+                                                    </constraints>
+                                                </stackView>
+                                                <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="vc3-qe-cTN">
+                                                    <rect key="frame" x="32" y="90" width="327" height="27"/>
+                                                    <subviews>
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qy2-Ll-2FL">
+                                                            <rect key="frame" x="0.0" y="0.0" width="30" height="27"/>
+                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周一">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                        <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hQt-nQ-yDV">
+                                                            <rect key="frame" x="49.5" y="0.0" width="30" height="27"/>
+                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周二">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                        <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GeN-7S-V8E">
+                                                            <rect key="frame" x="99" y="0.0" width="30" height="27"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周三">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                        <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xOJ-cj-hMc">
+                                                            <rect key="frame" x="148.5" y="0.0" width="30" height="27"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周四">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                        <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Szk-bc-YOL">
+                                                            <rect key="frame" x="198" y="0.0" width="30" height="27"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周五">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                        <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qxa-Na-eLg">
+                                                            <rect key="frame" x="247.5" y="0.0" width="30" height="27"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周六">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                        <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="To9-IU-AE6">
+                                                            <rect key="frame" x="297" y="0.0" width="30" height="27"/>
+                                                            <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                            <state key="normal" title="周日">
+                                                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                            </state>
+                                                        </button>
+                                                    </subviews>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailingMargin" secondItem="F44-6G-rM2" secondAttribute="trailing" constant="16" id="2ZB-Co-2pB"/>
+                                                <constraint firstItem="F44-6G-rM2" firstAttribute="top" secondItem="o2n-Cg-nQo" secondAttribute="bottom" constant="5" id="8pt-BZ-t3e"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="vc3-qe-cTN" secondAttribute="trailing" id="F4z-Sg-29S"/>
+                                                <constraint firstItem="vc3-qe-cTN" firstAttribute="top" secondItem="F44-6G-rM2" secondAttribute="bottom" constant="5" id="SS2-2g-5NJ"/>
+                                                <constraint firstItem="vc3-qe-cTN" firstAttribute="leading" secondItem="vBL-Zg-uX0" secondAttribute="leadingMargin" constant="16" id="XMb-c7-8LK"/>
+                                                <constraint firstItem="o2n-Cg-nQo" firstAttribute="leading" secondItem="vBL-Zg-uX0" secondAttribute="leading" constant="16" id="eqQ-It-Ump"/>
+                                                <constraint firstAttribute="trailing" secondItem="o2n-Cg-nQo" secondAttribute="trailing" constant="18" id="oxH-8z-faW"/>
+                                                <constraint firstItem="F44-6G-rM2" firstAttribute="leading" secondItem="vBL-Zg-uX0" secondAttribute="leadingMargin" constant="16" id="qc8-ft-bgf"/>
+                                                <constraint firstItem="o2n-Cg-nQo" firstAttribute="top" secondItem="vBL-Zg-uX0" secondAttribute="top" id="xMp-X8-TEi"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="160" id="mRu-Km-9dY">
+                                        <rect key="frame" x="0.0" y="418" width="375" height="160"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mRu-Km-9dY" id="HFU-yb-U6N">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <webView contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S5p-a6-Tlk">
+                                                    <rect key="frame" x="24" y="19" width="343" height="40"/>
+                                                    <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="40" id="3Bl-DY-BuS"/>
+                                                    </constraints>
+                                                </webView>
+                                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OMA-Fp-nFl">
+                                                    <rect key="frame" x="24" y="99" width="327" height="30"/>
+                                                    <color key="backgroundColor" red="0.98431372549019602" green="0.27843137254901962" blue="0.27843137254901962" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <state key="normal" title="删   除">
+                                                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </state>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                            <real key="value" value="5"/>
+                                                        </userDefinedRuntimeAttribute>
+                                                    </userDefinedRuntimeAttributes>
+                                                    <connections>
+                                                        <action selector="tapDeleteBtn:" destination="Vxk-45-vB1" eventType="touchUpInside" id="d3V-gw-XoF"/>
+                                                    </connections>
+                                                </button>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pZL-hd-WYm">
+                                                    <rect key="frame" x="24" y="64" width="62" height="30"/>
+                                                    <state key="normal" title="编辑内容"/>
+                                                    <connections>
+                                                        <segue destination="LoN-sU-f4i" kind="presentation" id="HaO-ws-b1o"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="OMA-Fp-nFl" firstAttribute="leading" secondItem="HFU-yb-U6N" secondAttribute="leadingMargin" constant="8" id="97b-Ys-rUu"/>
+                                                <constraint firstItem="S5p-a6-Tlk" firstAttribute="trailing" secondItem="HFU-yb-U6N" secondAttribute="trailingMargin" constant="8" id="T2S-lh-VWn"/>
+                                                <constraint firstItem="OMA-Fp-nFl" firstAttribute="top" secondItem="pZL-hd-WYm" secondAttribute="bottom" constant="5" id="T34-Vg-GIS"/>
+                                                <constraint firstItem="pZL-hd-WYm" firstAttribute="top" secondItem="S5p-a6-Tlk" secondAttribute="bottom" constant="5" id="YNG-yg-GpS"/>
+                                                <constraint firstItem="S5p-a6-Tlk" firstAttribute="top" secondItem="HFU-yb-U6N" secondAttribute="topMargin" constant="8" id="bHC-ew-Qzc"/>
+                                                <constraint firstItem="pZL-hd-WYm" firstAttribute="leading" secondItem="HFU-yb-U6N" secondAttribute="leadingMargin" constant="8" id="c1g-Fb-v1z"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="OMA-Fp-nFl" secondAttribute="trailing" constant="8" id="nNm-oJ-YGS"/>
+                                                <constraint firstItem="S5p-a6-Tlk" firstAttribute="leading" secondItem="HFU-yb-U6N" secondAttribute="leadingMargin" constant="8" id="q1j-mr-LYR"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="Vxk-45-vB1" id="XpN-cu-Ay8"/>
+                            <outlet property="delegate" destination="Vxk-45-vB1" id="18X-HM-sWl"/>
+                        </connections>
+                    </tableView>
                     <connections>
                     <connections>
-                      <action selector="todayAction:" destination="xYY-yG-JGa" eventType="touchUpInside" id="Wd8-Ne-Gwr"/>
+                        <outlet property="calendarLabelView" destination="d6a-1J-M0C" id="Hah-Vb-rPQ"/>
+                        <outlet property="calendarStackView" destination="evq-G0-rF6" id="WFq-vh-dm0"/>
+                        <outlet property="deleteBtn" destination="OMA-Fp-nFl" id="TGm-RG-0hj"/>
+                        <outlet property="evenEndTimeStackView" destination="lNF-vK-WbX" id="Ad5-xH-qU5"/>
+                        <outlet property="eventAllDaySwitch" destination="PwN-cV-5Cp" id="2NZ-HE-72x"/>
+                        <outlet property="eventColorStackView" destination="i8o-dB-E0v" id="cbm-j1-pSM"/>
+                        <outlet property="eventEndTime" destination="Rqe-Vw-UzF" id="TET-gY-0on"/>
+                        <outlet property="eventStartTime" destination="Dub-8d-dx7" id="9np-fO-mk8"/>
+                        <outlet property="eventStartTimeStackView" destination="HqM-sQ-xhn" id="kkn-0i-smN"/>
+                        <outlet property="eventTitle" destination="gaP-Lw-V7E" id="7V2-hB-clk"/>
+                        <outlet property="remindLabelView" destination="Wt4-bF-zw0" id="4QZ-hV-x7l"/>
+                        <outlet property="remindStackView" destination="Nvw-Uv-y4F" id="BOB-Rf-hJB"/>
+                        <outlet property="repeatLabelView" destination="WGv-Yu-hGd" id="BvD-7W-jbU"/>
+                        <outlet property="repeatStackView" destination="o2n-Cg-nQo" id="RcR-mR-FVx"/>
+                        <outlet property="repeatTableViewCell" destination="e5P-Ds-0Jm" id="vbx-6i-wdG"/>
+                        <outlet property="untilDateLabel" destination="k6W-yh-OR2" id="Z4N-tW-TwM"/>
+                        <outlet property="untilDateStackView" destination="F44-6G-rM2" id="od1-Zb-XkP"/>
+                        <outlet property="webRemark" destination="S5p-a6-Tlk" id="RgQ-ZK-Iis"/>
+                        <outlet property="weekDaysStackView" destination="vc3-qe-cTN" id="D73-xs-enz"/>
                     </connections>
                     </connections>
-                  </button>
-                  <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="71T-qf-T8Z">
-                    <rect key="frame" x="324" y="3.5" width="35" height="33"/>
-                    <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                    <state key="normal" title="日历"/>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="UiU-q1-2zR" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1816.8" y="-694.00299850074964"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="Uen-X6-xyC">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="tKt-3P-uQz" customClass="ZLNavigationController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="tBY-YA-bTM">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
                     <connections>
                     <connections>
-                      <segue destination="L5W-fh-UuH" kind="show" id="DF4-xt-Rlu"/>
+                        <segue destination="xYY-yG-JGa" kind="relationship" relationship="rootViewController" id="1nR-FI-RTb"/>
                     </connections>
                     </connections>
-                  </button>
-                </subviews>
-                <color key="backgroundColor" red="0.97647058823529409" green="0.97647058823529409" blue="0.97647058823529409" alpha="1" colorSpace="calibratedRGB"/>
-                <constraints>
-                  <constraint firstAttribute="height" constant="40" id="EPO-5J-aQ8"/>
-                  <constraint firstItem="wt1-wW-6mZ" firstAttribute="leading" secondItem="M0F-7m-vuY" secondAttribute="leading" constant="16" id="aoT-z2-Iuk"/>
-                  <constraint firstAttribute="trailing" secondItem="71T-qf-T8Z" secondAttribute="trailing" constant="16" id="bQo-4L-Bhv"/>
-                  <constraint firstItem="wt1-wW-6mZ" firstAttribute="centerY" secondItem="M0F-7m-vuY" secondAttribute="centerY" id="opA-fa-ziv"/>
-                  <constraint firstItem="71T-qf-T8Z" firstAttribute="centerY" secondItem="M0F-7m-vuY" secondAttribute="centerY" id="ufw-UJ-60Y"/>
-                </constraints>
-              </view>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <constraints>
-              <constraint firstItem="M0F-7m-vuY" firstAttribute="bottom" secondItem="YOP-fD-eOB" secondAttribute="bottom" id="1g7-OC-yaV"/>
-              <constraint firstItem="KJj-zi-dZB" firstAttribute="leading" secondItem="YOP-fD-eOB" secondAttribute="leading" id="8Bi-5G-lvJ"/>
-              <constraint firstItem="M0F-7m-vuY" firstAttribute="top" secondItem="KJj-zi-dZB" secondAttribute="bottom" id="AIF-zg-ryj"/>
-              <constraint firstItem="KJj-zi-dZB" firstAttribute="trailing" secondItem="YOP-fD-eOB" secondAttribute="trailing" id="MLm-Tk-l38"/>
-              <constraint firstItem="M0F-7m-vuY" firstAttribute="trailing" secondItem="YOP-fD-eOB" secondAttribute="trailing" id="dJ4-wm-Y8z"/>
-              <constraint firstItem="M0F-7m-vuY" firstAttribute="leading" secondItem="YOP-fD-eOB" secondAttribute="leading" id="kLc-Qp-gzN"/>
-              <constraint firstItem="KJj-zi-dZB" firstAttribute="top" secondItem="YOP-fD-eOB" secondAttribute="top" id="plZ-2M-2pz"/>
-            </constraints>
-            <viewLayoutGuide key="safeArea" id="YOP-fD-eOB"/>
-          </view>
-          <navigationItem key="navigationItem" id="4qR-Bd-8HM"/>
-          <connections>
-            <outlet property="calendarBtn" destination="71T-qf-T8Z" id="kmy-qp-47B"/>
-            <outlet property="tableView" destination="KJj-zi-dZB" id="BLE-0u-ldM"/>
-            <outlet property="todayBtn" destination="wt1-wW-6mZ" id="oTj-Yv-omZ"/>
-          </connections>
-        </viewController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="NFS-3Q-UWF" userLabel="First Responder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="848.79999999999995" y="-694.00299850074964"/>
-    </scene>
-    <!--Calendar Event View Controller-->
-    <scene sceneID="Aj2-RD-S3x">
-      <objects>
-        <tableViewController id="Vxk-45-vB1" customClass="OOCalendarEventViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="7H1-7C-M3e">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <sections>
-              <tableViewSection id="Ogn-vO-7jG">
-                <cells>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="45" id="uxG-oP-2Jx">
-                    <rect key="frame" x="0.0" y="28" width="375" height="45"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="uxG-oP-2Jx" id="MKv-co-tJv">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="例如:开会" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gaP-Lw-V7E">
-                          <rect key="frame" x="16" y="5" width="354" height="35"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="gaP-Lw-V7E" firstAttribute="top" secondItem="MKv-co-tJv" secondAttribute="top" constant="5" id="Umh-GC-vHb"/>
-                        <constraint firstAttribute="bottom" secondItem="gaP-Lw-V7E" secondAttribute="bottom" constant="5" id="aYp-Fg-OyP"/>
-                        <constraint firstItem="gaP-Lw-V7E" firstAttribute="leading" secondItem="MKv-co-tJv" secondAttribute="leading" constant="16" id="szc-Rj-gp8"/>
-                        <constraint firstAttribute="trailing" secondItem="gaP-Lw-V7E" secondAttribute="trailing" constant="5" id="uFD-7h-XoM"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="120" id="Nqb-uU-RgB">
-                    <rect key="frame" x="0.0" y="73" width="375" height="120"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Nqb-uU-RgB" id="PQX-mp-zBS">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="120"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="lpS-Ep-u9o">
-                          <rect key="frame" x="16" y="5" width="100" height="24"/>
-                          <subviews>
-                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="PwN-cV-5Cp">
-                              <rect key="frame" x="0.0" y="0.0" width="50" height="24"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="48" id="Cy3-uM-ruq"/>
-                                <constraint firstAttribute="height" constant="24" id="VCr-I8-jVq"/>
-                              </constraints>
-                              <connections>
-                                <action selector="tapAllDaySwitch:" destination="Vxk-45-vB1" eventType="valueChanged" id="rrC-lO-H2n"/>
-                              </connections>
-                            </switch>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全天" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rdY-4r-1NV">
-                              <rect key="frame" x="63" y="0.0" width="37" height="24"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                              <nil key="textColor"/>
-                              <nil key="highlightedColor"/>
-                            </label>
-                          </subviews>
-                          <constraints>
-                            <constraint firstAttribute="width" constant="100" id="s4W-o2-CN4"/>
-                          </constraints>
-                        </stackView>
-                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_shijian" translatesAutoresizingMaskIntoConstraints="NO" id="sfg-C9-T2u">
-                          <rect key="frame" x="16" y="45" width="22" height="22"/>
-                          <constraints>
-                            <constraint firstAttribute="width" constant="22" id="6WJ-71-uTo"/>
-                            <constraint firstAttribute="height" constant="22" id="9gU-gy-aua"/>
-                          </constraints>
-                        </imageView>
-                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="NNc-Zq-e8a">
-                          <rect key="frame" x="74" y="46" width="285" height="64"/>
-                          <subviews>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HqM-sQ-xhn">
-                              <rect key="frame" x="0.0" y="0.0" width="285" height="22"/>
-                              <subviews>
-                                <label opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年07月30日 13:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dub-8d-dx7">
-                                  <rect key="frame" x="0.0" y="0.0" width="261" height="22"/>
-                                  <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                  <nil key="textColor"/>
-                                  <nil key="highlightedColor"/>
-                                </label>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="23o-Vb-7fY">
-                                  <rect key="frame" x="261" y="0.0" width="24" height="22"/>
-                                  <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="HAj-Bt-7rV"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                            </stackView>
-                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lNF-vK-WbX">
-                              <rect key="frame" x="0.0" y="42" width="285" height="22"/>
-                              <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018年07月30日 13:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rqe-Vw-UzF">
-                                  <rect key="frame" x="0.0" y="0.0" width="261" height="22"/>
-                                  <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
-                                  <nil key="textColor"/>
-                                  <nil key="highlightedColor"/>
-                                </label>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_arrow" translatesAutoresizingMaskIntoConstraints="NO" id="y7l-as-AD6">
-                                  <rect key="frame" x="261" y="0.0" width="24" height="22"/>
-                                  <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="sMs-sB-hyI"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ia6-rz-Icf" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-90.400000000000006" y="-694.00299850074964"/>
+        </scene>
+        <!--Calendar Left Menu Controller-->
+        <scene sceneID="3By-VB-pei">
+            <objects>
+                <tableViewController id="L5W-fh-UuH" customClass="OOCalendarLeftMenuController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="FSW-kR-JAk">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <containerView key="tableHeaderView" opaque="NO" contentMode="scaleToFill" id="KcX-qQ-DIF">
+                            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                            <connections>
+                                <segue destination="xFe-Nw-gR2" kind="embed" id="JrC-H1-NOw"/>
+                            </connections>
+                        </containerView>
+                        <prototypes>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="calendarTableCell" id="hIV-F8-hEt" customClass="CalendarTableViewCell" customModule="O2Platform" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="78" width="375" height="43.5"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hIV-F8-hEt" id="vcr-nc-qYD">
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <subviews>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nUr-LS-pfg">
+                                            <rect key="frame" x="24" y="13" width="18" height="18"/>
+                                            <color key="backgroundColor" red="0.29803921570000003" green="0.68627450980000004" blue="0.31372549020000001" alpha="1" colorSpace="calibratedRGB"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" constant="18" id="5lB-4A-bhs"/>
+                                                <constraint firstAttribute="height" constant="18" id="GBp-du-Gru"/>
+                                            </constraints>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                    <real key="value" value="9"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
+                                        </view>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的日历" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="onv-WL-BxB">
+                                            <rect key="frame" x="52" y="11.5" width="263" height="20.5"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BTT-cO-3bH">
+                                            <rect key="frame" x="325" y="10" width="34" height="24"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="24" id="vBm-Id-XQ9"/>
+                                                <constraint firstAttribute="width" constant="32" id="ySg-20-HOz"/>
+                                            </constraints>
+                                            <connections>
+                                                <action selector="calendarSwitchTap:" destination="hIV-F8-hEt" eventType="valueChanged" id="cgk-KU-AwN"/>
+                                            </connections>
+                                        </switch>
+                                    </subviews>
+                                    <constraints>
+                                        <constraint firstItem="nUr-LS-pfg" firstAttribute="centerY" secondItem="vcr-nc-qYD" secondAttribute="centerY" id="0fm-s1-CUn"/>
+                                        <constraint firstItem="BTT-cO-3bH" firstAttribute="centerY" secondItem="vcr-nc-qYD" secondAttribute="centerY" id="JcJ-17-Hw0"/>
+                                        <constraint firstItem="onv-WL-BxB" firstAttribute="centerY" secondItem="vcr-nc-qYD" secondAttribute="centerY" id="MiO-8E-It5"/>
+                                        <constraint firstItem="BTT-cO-3bH" firstAttribute="leading" secondItem="onv-WL-BxB" secondAttribute="trailing" constant="10" id="ZWp-uB-5KZ"/>
+                                        <constraint firstItem="onv-WL-BxB" firstAttribute="leading" secondItem="nUr-LS-pfg" secondAttribute="trailing" constant="10" id="bbS-0Q-jnE"/>
+                                        <constraint firstAttribute="trailing" secondItem="BTT-cO-3bH" secondAttribute="trailing" constant="18" id="kUb-UW-eTW"/>
+                                        <constraint firstItem="nUr-LS-pfg" firstAttribute="leading" secondItem="vcr-nc-qYD" secondAttribute="leading" constant="24" id="sih-O1-7td"/>
+                                    </constraints>
+                                </tableViewCellContentView>
+                                <connections>
+                                    <outlet property="calendarColorView" destination="nUr-LS-pfg" id="OOL-1P-0oF"/>
+                                    <outlet property="calendarNameView" destination="onv-WL-BxB" id="QCD-H7-VUE"/>
+                                    <outlet property="calendarSwitch" destination="BTT-cO-3bH" id="dFh-ng-dUj"/>
+                                </connections>
+                            </tableViewCell>
+                        </prototypes>
+                        <sections/>
+                        <connections>
+                            <outlet property="dataSource" destination="L5W-fh-UuH" id="Sjl-ck-xz3"/>
+                            <outlet property="delegate" destination="L5W-fh-UuH" id="Hl3-Fp-5PQ"/>
+                        </connections>
+                    </tableView>
+                    <connections>
+                        <outlet property="addCalendarBtnView" destination="KcX-qQ-DIF" id="kAk-es-Ig5"/>
+                        <segue destination="6hI-Zf-Dol" kind="show" identifier="showCalendarSegue" id="dTl-zx-3mn"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ffa-JI-hF2" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-90" y="139"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="EQw-x0-gJd">
+            <objects>
+                <viewController id="xFe-Nw-gR2" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="lIW-wy-yeL">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="9kE-CW-qbe">
+                                <rect key="frame" x="32" y="0.0" width="311" height="50"/>
+                                <subviews>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_zengjia" translatesAutoresizingMaskIntoConstraints="NO" id="fce-xE-dhf">
+                                        <rect key="frame" x="0.0" y="14" width="22" height="22"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="22" id="nfU-kQ-Cuu"/>
+                                            <constraint firstAttribute="width" constant="22" id="sK8-rN-1yv"/>
+                                        </constraints>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新增日历" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lgr-ZD-kXw">
+                                        <rect key="frame" x="38" y="15" width="273" height="20.5"/>
+                                        <gestureRecognizers/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
                             </stackView>
                             </stackView>
-                          </subviews>
-                          <gestureRecognizers/>
-                          <constraints>
-                            <constraint firstAttribute="height" constant="64" id="S4m-1J-ydh"/>
-                          </constraints>
-                        </stackView>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="NNc-Zq-e8a" firstAttribute="leading" secondItem="sfg-C9-T2u" secondAttribute="trailing" constant="36" id="am8-ML-krx"/>
-                        <constraint firstItem="lpS-Ep-u9o" firstAttribute="top" secondItem="PQX-mp-zBS" secondAttribute="top" constant="5" id="c3D-PO-yJC"/>
-                        <constraint firstItem="sfg-C9-T2u" firstAttribute="leading" secondItem="PQX-mp-zBS" secondAttribute="leadingMargin" id="dds-UT-Ghg"/>
-                        <constraint firstItem="sfg-C9-T2u" firstAttribute="top" secondItem="lpS-Ep-u9o" secondAttribute="bottom" constant="16" id="kcR-EW-imZ"/>
-                        <constraint firstAttribute="trailingMargin" secondItem="NNc-Zq-e8a" secondAttribute="trailing" id="pmh-Pn-TSi"/>
-                        <constraint firstItem="lpS-Ep-u9o" firstAttribute="leading" secondItem="PQX-mp-zBS" secondAttribute="leading" constant="16" id="s0k-x8-Y6F"/>
-                        <constraint firstItem="NNc-Zq-e8a" firstAttribute="top" secondItem="lpS-Ep-u9o" secondAttribute="bottom" constant="17" id="vUd-A0-kwF"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="60" id="4Gg-JY-9Yo">
-                    <rect key="frame" x="0.0" y="193" width="375" height="60"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4Gg-JY-9Yo" id="7Su-0t-5EZ">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="evq-G0-rF6">
-                          <rect key="frame" x="16" y="0.0" width="359" height="60"/>
-                          <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_hdjr" translatesAutoresizingMaskIntoConstraints="NO" id="kBX-9l-V1q">
-                              <rect key="frame" x="0.0" y="19" width="22" height="22"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="22" id="1FT-SO-P9R"/>
-                                <constraint firstAttribute="height" constant="22" id="rqM-2X-wbT"/>
-                              </constraints>
-                            </imageView>
-                            <pickerView tag="110" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pyF-R2-ql8">
-                              <rect key="frame" x="37" y="0.0" width="322" height="60"/>
-                              <connections>
-                                <outlet property="dataSource" destination="Vxk-45-vB1" id="5Dd-B7-Q9q"/>
-                                <outlet property="delegate" destination="Vxk-45-vB1" id="8qX-9R-aTO"/>
-                              </connections>
-                            </pickerView>
-                          </subviews>
-                        </stackView>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="evq-G0-rF6" firstAttribute="top" secondItem="7Su-0t-5EZ" secondAttribute="top" id="1VO-mL-jHa"/>
-                        <constraint firstItem="evq-G0-rF6" firstAttribute="leading" secondItem="7Su-0t-5EZ" secondAttribute="leading" constant="16" id="h8s-cf-9Sd"/>
-                        <constraint firstAttribute="trailing" secondItem="evq-G0-rF6" secondAttribute="trailing" id="oUj-3c-7gc"/>
-                        <constraint firstAttribute="bottom" secondItem="evq-G0-rF6" secondAttribute="bottom" id="uSr-V1-QZu"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="45" id="qQX-Lv-NHQ">
-                    <rect key="frame" x="0.0" y="253" width="375" height="45"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="qQX-Lv-NHQ" id="Tln-Ch-B5c">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="i8o-dB-E0v">
-                          <rect key="frame" x="20" y="8" width="339" height="29"/>
-                          <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dgr-Bu-MAQ" userLabel="blue">
-                              <rect key="frame" x="0.0" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="gmX-mE-SDk">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="6VV-qr-hlC"/>
-                                    <constraint firstAttribute="width" constant="18" id="Uxh-wh-1YZ"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.25882352941176467" green="0.5607843137254902" blue="0.9882352941176471" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="gmX-mE-SDk" firstAttribute="centerX" secondItem="Dgr-Bu-MAQ" secondAttribute="centerX" id="9aJ-c0-KjP"/>
-                                <constraint firstAttribute="width" constant="24" id="Ivw-Nt-e8L"/>
-                                <constraint firstItem="gmX-mE-SDk" firstAttribute="centerY" secondItem="Dgr-Bu-MAQ" secondAttribute="centerY" id="Y6X-EZ-SM0"/>
-                                <constraint firstAttribute="height" constant="24" id="aY4-rA-in7"/>
-                              </constraints>
-                            </view>
-                            <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nS3-qA-VwA" userLabel="green">
-                              <rect key="frame" x="45" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="D3N-kh-Mq7">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="WOI-Ze-YEg"/>
-                                    <constraint firstAttribute="width" constant="18" id="ZQ2-1O-AN1"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.35686274509803922" green="0.80000000000000004" blue="0.38039215686274508" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="D3N-kh-Mq7" firstAttribute="centerY" secondItem="nS3-qA-VwA" secondAttribute="centerY" id="8BK-XT-xJE"/>
-                                <constraint firstAttribute="width" constant="24" id="SRZ-Rw-NfW"/>
-                                <constraint firstAttribute="height" constant="24" id="kPY-21-Y5A"/>
-                                <constraint firstItem="D3N-kh-Mq7" firstAttribute="centerX" secondItem="nS3-qA-VwA" secondAttribute="centerX" id="ltQ-jl-c7u"/>
-                              </constraints>
-                            </view>
-                            <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hRM-n9-khc" userLabel="orangle">
-                              <rect key="frame" x="90" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="KzE-S1-77g">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="AUe-S7-hB3"/>
-                                    <constraint firstAttribute="width" constant="18" id="aFI-ew-wtP"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.97647058823529409" green="0.74901960784313726" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="KzE-S1-77g" firstAttribute="centerY" secondItem="hRM-n9-khc" secondAttribute="centerY" id="HEF-qz-tnK"/>
-                                <constraint firstAttribute="height" constant="24" id="HQu-84-yYi"/>
-                                <constraint firstItem="KzE-S1-77g" firstAttribute="centerX" secondItem="hRM-n9-khc" secondAttribute="centerX" id="ceb-An-1Tu"/>
-                                <constraint firstAttribute="width" constant="24" id="mck-HZ-ZCw"/>
-                              </constraints>
-                            </view>
-                            <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ggx-2y-fDS" userLabel="crimson">
-                              <rect key="frame" x="135" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="GK6-ih-mWE">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="ae3-zr-8aw"/>
-                                    <constraint firstAttribute="width" constant="18" id="w5l-GX-PJI"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.96862745098039216" green="0.37254901960784315" blue="0.34901960784313724" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="24" id="UMl-J7-DNy"/>
-                                <constraint firstItem="GK6-ih-mWE" firstAttribute="centerX" secondItem="Ggx-2y-fDS" secondAttribute="centerX" id="bXf-5U-QEv"/>
-                                <constraint firstAttribute="height" constant="24" id="hfe-b7-39J"/>
-                                <constraint firstItem="GK6-ih-mWE" firstAttribute="centerY" secondItem="Ggx-2y-fDS" secondAttribute="centerY" id="w1I-Sz-h3c"/>
-                              </constraints>
-                            </view>
-                            <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OGU-7P-pbj" userLabel="lightpurple">
-                              <rect key="frame" x="180" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="yE3-0X-Ixh">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="width" constant="18" id="ARI-92-xj5"/>
-                                    <constraint firstAttribute="height" constant="18" id="Rnx-ld-gJh"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.94509803921568625" green="0.50196078431372548" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="yE3-0X-Ixh" firstAttribute="centerY" secondItem="OGU-7P-pbj" secondAttribute="centerY" id="782-Qj-Dlk"/>
-                                <constraint firstAttribute="width" constant="24" id="Fv9-El-C1c"/>
-                                <constraint firstAttribute="height" constant="24" id="HVA-E8-C61"/>
-                                <constraint firstItem="yE3-0X-Ixh" firstAttribute="centerX" secondItem="OGU-7P-pbj" secondAttribute="centerX" id="dqb-xX-kM8"/>
-                              </constraints>
-                            </view>
-                            <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="H7n-vf-H9J" userLabel="purple">
-                              <rect key="frame" x="225" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="D0E-yX-QaI">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="TFo-D4-GPF"/>
-                                    <constraint firstAttribute="width" constant="18" id="iAL-KH-v80"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.56470588235294117" green="0.44705882352941173" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="height" constant="24" id="8gq-CO-eTY"/>
-                                <constraint firstItem="D0E-yX-QaI" firstAttribute="centerY" secondItem="H7n-vf-H9J" secondAttribute="centerY" id="99s-cw-T7m"/>
-                                <constraint firstAttribute="width" constant="24" id="E8S-ZW-5fe"/>
-                                <constraint firstItem="D0E-yX-QaI" firstAttribute="centerX" secondItem="H7n-vf-H9J" secondAttribute="centerX" id="sRT-G7-gp6"/>
-                              </constraints>
-                            </view>
-                            <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="118-Aw-aif" userLabel="gray">
-                              <rect key="frame" x="270" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="8UA-Zc-sdH">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="J8p-K5-Xsp"/>
-                                    <constraint firstAttribute="width" constant="18" id="KUz-t8-9b4"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.56470588235294117" green="0.56470588235294117" blue="0.56470588235294117" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="8UA-Zc-sdH" firstAttribute="centerY" secondItem="118-Aw-aif" secondAttribute="centerY" id="5PU-ld-WL6"/>
-                                <constraint firstAttribute="height" constant="24" id="EoQ-gB-JFa"/>
-                                <constraint firstAttribute="width" constant="24" id="gYN-JO-57r"/>
-                                <constraint firstItem="8UA-Zc-sdH" firstAttribute="centerX" secondItem="118-Aw-aif" secondAttribute="centerX" id="lfI-fD-zeO"/>
-                              </constraints>
-                            </view>
-                            <view tag="7" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aua-TK-Qnv" userLabel="cyanine">
-                              <rect key="frame" x="315" y="2.5" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="tye-Jf-YHm">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="5WS-2e-3QG"/>
-                                    <constraint firstAttribute="width" constant="18" id="mHx-1M-qnT"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.078431372549019607" green="0.38431372549019605" blue="0.74509803921568629" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="24" id="4nx-sl-RIa"/>
-                                <constraint firstAttribute="height" constant="24" id="Kpb-lJ-sTI"/>
-                                <constraint firstItem="tye-Jf-YHm" firstAttribute="centerY" secondItem="aua-TK-Qnv" secondAttribute="centerY" id="cKv-Ul-QD0"/>
-                                <constraint firstItem="tye-Jf-YHm" firstAttribute="centerX" secondItem="aua-TK-Qnv" secondAttribute="centerX" id="cYE-GL-WBJ"/>
-                              </constraints>
-                            </view>
-                          </subviews>
-                        </stackView>
-                      </subviews>
-                      <constraints>
-                        <constraint firstAttribute="trailing" secondItem="i8o-dB-E0v" secondAttribute="trailing" constant="16" id="8Ox-ef-kQX"/>
-                        <constraint firstAttribute="bottom" secondItem="i8o-dB-E0v" secondAttribute="bottom" constant="8" id="Zut-5K-hJS"/>
-                        <constraint firstItem="i8o-dB-E0v" firstAttribute="leading" secondItem="Tln-Ch-B5c" secondAttribute="leading" constant="20" id="iT4-S9-mfI"/>
-                        <constraint firstItem="i8o-dB-E0v" firstAttribute="top" secondItem="Tln-Ch-B5c" secondAttribute="top" constant="8" id="lBf-sr-HQW"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="60" id="u6G-MU-dPL">
-                    <rect key="frame" x="0.0" y="298" width="375" height="60"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="u6G-MU-dPL" id="auw-zx-G07">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="Nvw-Uv-y4F">
-                          <rect key="frame" x="16" y="0.0" width="359" height="60"/>
-                          <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_tixing" translatesAutoresizingMaskIntoConstraints="NO" id="JPO-Kb-7YE">
-                              <rect key="frame" x="0.0" y="19" width="22" height="22"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="22" id="XHQ-Ne-kEe"/>
-                                <constraint firstAttribute="height" constant="22" id="i2w-Kk-1a1"/>
-                              </constraints>
-                            </imageView>
-                            <pickerView tag="111" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eRL-b7-sZv">
-                              <rect key="frame" x="37" y="0.0" width="322" height="60"/>
-                              <connections>
-                                <outlet property="dataSource" destination="Vxk-45-vB1" id="X6V-QF-7cw"/>
-                                <outlet property="delegate" destination="Vxk-45-vB1" id="cI2-NL-CGH"/>
-                              </connections>
-                            </pickerView>
-                          </subviews>
-                        </stackView>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="Nvw-Uv-y4F" firstAttribute="top" secondItem="auw-zx-G07" secondAttribute="top" id="BS2-oE-3V6"/>
-                        <constraint firstAttribute="bottom" secondItem="Nvw-Uv-y4F" secondAttribute="bottom" id="S9Y-Ea-NPh"/>
-                        <constraint firstAttribute="trailing" secondItem="Nvw-Uv-y4F" secondAttribute="trailing" id="mVM-zG-UZP"/>
-                        <constraint firstItem="Nvw-Uv-y4F" firstAttribute="leading" secondItem="auw-zx-G07" secondAttribute="leading" constant="16" id="oXw-gx-pWs"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="60" id="e5P-Ds-0Jm">
-                    <rect key="frame" x="0.0" y="358" width="375" height="60"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e5P-Ds-0Jm" id="vBL-Zg-uX0">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="o2n-Cg-nQo">
-                          <rect key="frame" x="16" y="0.0" width="359" height="60"/>
-                          <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_chongfu" translatesAutoresizingMaskIntoConstraints="NO" id="W5r-qL-MRy">
-                              <rect key="frame" x="0.0" y="19" width="22" height="22"/>
-                              <constraints>
-                                <constraint firstAttribute="height" constant="22" id="eN6-V0-CcT"/>
-                                <constraint firstAttribute="width" constant="22" id="mxs-yb-OVM"/>
-                              </constraints>
-                            </imageView>
-                            <pickerView tag="112" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fbt-RB-x4p">
-                              <rect key="frame" x="37" y="0.0" width="322" height="60"/>
-                              <connections>
-                                <outlet property="dataSource" destination="Vxk-45-vB1" id="cCT-Ga-6th"/>
-                                <outlet property="delegate" destination="Vxk-45-vB1" id="TRG-7c-mdR"/>
-                              </connections>
-                            </pickerView>
-                          </subviews>
-                          <constraints>
-                            <constraint firstAttribute="height" constant="60" id="gjT-w1-VIx"/>
-                          </constraints>
-                        </stackView>
-                        <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" alignment="center" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="F44-6G-rM2">
-                          <rect key="frame" x="32" y="65" width="311" height="20"/>
-                          <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="截至日期:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IMf-BA-twt">
-                              <rect key="frame" x="0.0" y="3" width="64" height="14.5"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="64" id="oup-D2-hLu"/>
-                              </constraints>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <nil key="textColor"/>
-                              <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k6W-yh-OR2">
-                              <rect key="frame" x="79" y="0.0" width="232" height="20"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              <nil key="highlightedColor"/>
-                            </label>
-                          </subviews>
-                          <constraints>
-                            <constraint firstAttribute="height" constant="20" id="iwQ-Pk-1HS"/>
-                          </constraints>
-                        </stackView>
-                        <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="vc3-qe-cTN">
-                          <rect key="frame" x="32" y="90" width="327" height="27"/>
-                          <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qy2-Ll-2FL">
-                              <rect key="frame" x="0.0" y="0.0" width="30" height="27"/>
-                              <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周一">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hQt-nQ-yDV">
-                              <rect key="frame" x="49.5" y="0.0" width="30" height="27"/>
-                              <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周二">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                            <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GeN-7S-V8E">
-                              <rect key="frame" x="99" y="0.0" width="30" height="27"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周三">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xOJ-cj-hMc">
-                              <rect key="frame" x="148.5" y="0.0" width="30" height="27"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周四">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                            <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Szk-bc-YOL">
-                              <rect key="frame" x="198" y="0.0" width="30" height="27"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周五">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                            <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qxa-Na-eLg">
-                              <rect key="frame" x="247.5" y="0.0" width="30" height="27"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周六">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                            <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="To9-IU-AE6">
-                              <rect key="frame" x="297" y="0.0" width="30" height="27"/>
-                              <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                              <state key="normal" title="周日">
-                                <color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                              </state>
-                            </button>
-                          </subviews>
-                        </stackView>
-                      </subviews>
-                      <constraints>
-                        <constraint firstAttribute="trailingMargin" secondItem="F44-6G-rM2" secondAttribute="trailing" constant="16" id="2ZB-Co-2pB"/>
-                        <constraint firstItem="F44-6G-rM2" firstAttribute="top" secondItem="o2n-Cg-nQo" secondAttribute="bottom" constant="5" id="8pt-BZ-t3e"/>
-                        <constraint firstAttribute="trailingMargin" secondItem="vc3-qe-cTN" secondAttribute="trailing" id="F4z-Sg-29S"/>
-                        <constraint firstItem="vc3-qe-cTN" firstAttribute="top" secondItem="F44-6G-rM2" secondAttribute="bottom" constant="5" id="SS2-2g-5NJ"/>
-                        <constraint firstItem="vc3-qe-cTN" firstAttribute="leading" secondItem="vBL-Zg-uX0" secondAttribute="leadingMargin" constant="16" id="XMb-c7-8LK"/>
-                        <constraint firstItem="o2n-Cg-nQo" firstAttribute="leading" secondItem="vBL-Zg-uX0" secondAttribute="leading" constant="16" id="eqQ-It-Ump"/>
-                        <constraint firstAttribute="trailing" secondItem="o2n-Cg-nQo" secondAttribute="trailing" id="oxH-8z-faW"/>
-                        <constraint firstItem="F44-6G-rM2" firstAttribute="leading" secondItem="vBL-Zg-uX0" secondAttribute="leadingMargin" constant="16" id="qc8-ft-bgf"/>
-                        <constraint firstItem="o2n-Cg-nQo" firstAttribute="top" secondItem="vBL-Zg-uX0" secondAttribute="top" id="xMp-X8-TEi"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="206" id="mRu-Km-9dY">
-                    <rect key="frame" x="0.0" y="418" width="375" height="206"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="mRu-Km-9dY" id="HFU-yb-U6N">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="206"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OMA-Fp-nFl">
-                          <rect key="frame" x="16" y="148" width="343" height="40"/>
-                          <color key="backgroundColor" red="0.98431372549019602" green="0.27843137254901962" blue="0.27843137254901962" alpha="1" colorSpace="calibratedRGB"/>
-                          <constraints>
-                            <constraint firstAttribute="height" constant="40" id="z38-hq-zd6"/>
-                          </constraints>
-                          <state key="normal" title="删   除">
-                            <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                          </state>
-                          <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                              <real key="value" value="5"/>
-                            </userDefinedRuntimeAttribute>
-                          </userDefinedRuntimeAttributes>
-                          <connections>
-                            <action selector="tapDeleteBtn:" destination="Vxk-45-vB1" eventType="touchUpInside" id="d3V-gw-XoF"/>
-                          </connections>
-                        </button>
-                        <webView contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="S5p-a6-Tlk">
-                          <rect key="frame" x="16" y="11" width="343" height="90"/>
-                          <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </webView>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pZL-hd-WYm">
-                          <rect key="frame" x="16" y="109" width="62" height="30"/>
-                          <state key="normal" title="编辑内容"/>
-                          <connections>
-                            <segue destination="LoN-sU-f4i" kind="presentation" id="HaO-ws-b1o"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="S5p-a6-Tlk" firstAttribute="trailing" secondItem="OMA-Fp-nFl" secondAttribute="trailing" id="7E1-je-yNn"/>
-                        <constraint firstItem="pZL-hd-WYm" firstAttribute="top" secondItem="S5p-a6-Tlk" secondAttribute="bottom" constant="8" id="9Z2-Ml-EPm"/>
-                        <constraint firstItem="OMA-Fp-nFl" firstAttribute="top" secondItem="pZL-hd-WYm" secondAttribute="bottom" constant="9" id="Olk-nI-9EA"/>
-                        <constraint firstItem="S5p-a6-Tlk" firstAttribute="leading" secondItem="pZL-hd-WYm" secondAttribute="leading" id="PLd-73-1r0"/>
-                        <constraint firstItem="pZL-hd-WYm" firstAttribute="leading" secondItem="OMA-Fp-nFl" secondAttribute="leading" id="XmT-aR-1oc"/>
-                        <constraint firstItem="OMA-Fp-nFl" firstAttribute="leading" secondItem="HFU-yb-U6N" secondAttribute="leading" constant="16" id="aya-2K-2Jr"/>
-                        <constraint firstAttribute="bottomMargin" secondItem="OMA-Fp-nFl" secondAttribute="bottom" constant="7" id="h7A-3s-Y55"/>
-                        <constraint firstItem="S5p-a6-Tlk" firstAttribute="top" secondItem="HFU-yb-U6N" secondAttribute="topMargin" id="q12-WJ-gjX"/>
-                        <constraint firstItem="S5p-a6-Tlk" firstAttribute="trailing" secondItem="HFU-yb-U6N" secondAttribute="trailingMargin" id="qjj-Vg-Thi"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                </cells>
-              </tableViewSection>
-            </sections>
-            <connections>
-              <outlet property="dataSource" destination="Vxk-45-vB1" id="XpN-cu-Ay8"/>
-              <outlet property="delegate" destination="Vxk-45-vB1" id="18X-HM-sWl"/>
-            </connections>
-          </tableView>
-          <connections>
-            <outlet property="calendarPickerView" destination="pyF-R2-ql8" id="ff9-q3-kSd"/>
-            <outlet property="deleteBtn" destination="OMA-Fp-nFl" id="TGm-RG-0hj"/>
-            <outlet property="evenEndTimeStackView" destination="lNF-vK-WbX" id="Ad5-xH-qU5"/>
-            <outlet property="eventAllDaySwitch" destination="PwN-cV-5Cp" id="2NZ-HE-72x"/>
-            <outlet property="eventColorStackView" destination="i8o-dB-E0v" id="cbm-j1-pSM"/>
-            <outlet property="eventEndTime" destination="Rqe-Vw-UzF" id="TET-gY-0on"/>
-            <outlet property="eventStartTime" destination="Dub-8d-dx7" id="9np-fO-mk8"/>
-            <outlet property="eventStartTimeStackView" destination="HqM-sQ-xhn" id="kkn-0i-smN"/>
-            <outlet property="eventTitle" destination="gaP-Lw-V7E" id="7V2-hB-clk"/>
-            <outlet property="remindPickerView" destination="eRL-b7-sZv" id="XWt-3h-5tg"/>
-            <outlet property="repeatPickerView" destination="fbt-RB-x4p" id="hTZ-eo-mYS"/>
-            <outlet property="repeatTableViewCell" destination="e5P-Ds-0Jm" id="vbx-6i-wdG"/>
-            <outlet property="untilDateLabel" destination="k6W-yh-OR2" id="Z4N-tW-TwM"/>
-            <outlet property="untilDateStackView" destination="F44-6G-rM2" id="od1-Zb-XkP"/>
-            <outlet property="webRemark" destination="S5p-a6-Tlk" id="RgQ-ZK-Iis"/>
-            <outlet property="weekDaysStackView" destination="vc3-qe-cTN" id="D73-xs-enz"/>
-          </connections>
-        </tableViewController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="UiU-q1-2zR" userLabel="First Responder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="1816.8" y="-694.00299850074964"/>
-    </scene>
-    <!--Navigation Controller-->
-    <scene sceneID="Uen-X6-xyC">
-      <objects>
-        <navigationController automaticallyAdjustsScrollViewInsets="NO" id="tKt-3P-uQz" customClass="ZLNavigationController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <toolbarItems/>
-          <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="tBY-YA-bTM">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-            <autoresizingMask key="autoresizingMask"/>
-          </navigationBar>
-          <nil name="viewControllers"/>
-          <connections>
-            <segue destination="xYY-yG-JGa" kind="relationship" relationship="rootViewController" id="1nR-FI-RTb"/>
-          </connections>
-        </navigationController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="Ia6-rz-Icf" userLabel="First Responder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="-90.400000000000006" y="-694.00299850074964"/>
-    </scene>
-    <!--Calendar Left Menu Controller-->
-    <scene sceneID="3By-VB-pei">
-      <objects>
-        <tableViewController id="L5W-fh-UuH" customClass="OOCalendarLeftMenuController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="FSW-kR-JAk">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <containerView key="tableHeaderView" opaque="NO" contentMode="scaleToFill" id="KcX-qQ-DIF">
-              <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
-              <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-              <connections>
-                <segue destination="xFe-Nw-gR2" kind="embed" id="JrC-H1-NOw"/>
-              </connections>
-            </containerView>
-            <prototypes>
-              <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="calendarTableCell" id="hIV-F8-hEt" customClass="CalendarTableViewCell" customModule="O2Platform" customModuleProvider="target">
-                <rect key="frame" x="0.0" y="78" width="375" height="43.5"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hIV-F8-hEt" id="vcr-nc-qYD">
-                  <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
-                  <autoresizingMask key="autoresizingMask"/>
-                  <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nUr-LS-pfg">
-                      <rect key="frame" x="24" y="13" width="18" height="18"/>
-                      <color key="backgroundColor" red="0.29803921570000003" green="0.68627450980000004" blue="0.31372549020000001" alpha="1" colorSpace="calibratedRGB"/>
-                      <constraints>
-                        <constraint firstAttribute="width" constant="18" id="5lB-4A-bhs"/>
-                        <constraint firstAttribute="height" constant="18" id="GBp-du-Gru"/>
-                      </constraints>
-                      <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                          <real key="value" value="9"/>
-                        </userDefinedRuntimeAttribute>
-                      </userDefinedRuntimeAttributes>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="9kE-CW-qbe" firstAttribute="leading" secondItem="lIW-wy-yeL" secondAttribute="leadingMargin" constant="16" id="5rg-Vk-iwb"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="9kE-CW-qbe" secondAttribute="trailing" constant="16" id="Bjh-rF-QQo"/>
+                            <constraint firstItem="9kE-CW-qbe" firstAttribute="top" secondItem="lIW-wy-yeL" secondAttribute="topMargin" id="DIn-lL-K5V"/>
+                            <constraint firstAttribute="bottomMargin" secondItem="9kE-CW-qbe" secondAttribute="bottom" id="vQB-at-qUU"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="VP9-5C-v7b"/>
                     </view>
                     </view>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的日历" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="onv-WL-BxB">
-                      <rect key="frame" x="52" y="11.5" width="263" height="20.5"/>
-                      <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                      <nil key="textColor"/>
-                      <nil key="highlightedColor"/>
-                    </label>
-                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BTT-cO-3bH">
-                      <rect key="frame" x="325" y="10" width="34" height="24"/>
-                      <constraints>
-                        <constraint firstAttribute="height" constant="24" id="vBm-Id-XQ9"/>
-                        <constraint firstAttribute="width" constant="32" id="ySg-20-HOz"/>
-                      </constraints>
-                      <connections>
-                        <action selector="calendarSwitchTap:" destination="hIV-F8-hEt" eventType="valueChanged" id="cgk-KU-AwN"/>
-                      </connections>
-                    </switch>
-                  </subviews>
-                  <constraints>
-                    <constraint firstItem="nUr-LS-pfg" firstAttribute="centerY" secondItem="vcr-nc-qYD" secondAttribute="centerY" id="0fm-s1-CUn"/>
-                    <constraint firstItem="BTT-cO-3bH" firstAttribute="centerY" secondItem="vcr-nc-qYD" secondAttribute="centerY" id="JcJ-17-Hw0"/>
-                    <constraint firstItem="onv-WL-BxB" firstAttribute="centerY" secondItem="vcr-nc-qYD" secondAttribute="centerY" id="MiO-8E-It5"/>
-                    <constraint firstItem="BTT-cO-3bH" firstAttribute="leading" secondItem="onv-WL-BxB" secondAttribute="trailing" constant="10" id="ZWp-uB-5KZ"/>
-                    <constraint firstItem="onv-WL-BxB" firstAttribute="leading" secondItem="nUr-LS-pfg" secondAttribute="trailing" constant="10" id="bbS-0Q-jnE"/>
-                    <constraint firstAttribute="trailing" secondItem="BTT-cO-3bH" secondAttribute="trailing" constant="18" id="kUb-UW-eTW"/>
-                    <constraint firstItem="nUr-LS-pfg" firstAttribute="leading" secondItem="vcr-nc-qYD" secondAttribute="leading" constant="24" id="sih-O1-7td"/>
-                  </constraints>
-                </tableViewCellContentView>
-                <connections>
-                  <outlet property="calendarColorView" destination="nUr-LS-pfg" id="OOL-1P-0oF"/>
-                  <outlet property="calendarNameView" destination="onv-WL-BxB" id="QCD-H7-VUE"/>
-                  <outlet property="calendarSwitch" destination="BTT-cO-3bH" id="dFh-ng-dUj"/>
-                </connections>
-              </tableViewCell>
-            </prototypes>
-            <sections/>
-            <connections>
-              <outlet property="dataSource" destination="L5W-fh-UuH" id="Sjl-ck-xz3"/>
-              <outlet property="delegate" destination="L5W-fh-UuH" id="Hl3-Fp-5PQ"/>
-            </connections>
-          </tableView>
-          <connections>
-            <outlet property="addCalendarBtnView" destination="KcX-qQ-DIF" id="kAk-es-Ig5"/>
-            <segue destination="6hI-Zf-Dol" kind="show" identifier="showCalendarSegue" id="dTl-zx-3mn"/>
-          </connections>
-        </tableViewController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="ffa-JI-hF2" userLabel="First Responder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="-90" y="139"/>
-    </scene>
-    <!--View Controller-->
-    <scene sceneID="EQw-x0-gJd">
-      <objects>
-        <viewController id="xFe-Nw-gR2" sceneMemberID="viewController">
-          <view key="view" contentMode="scaleToFill" id="lIW-wy-yeL">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-              <stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="9kE-CW-qbe">
-                <rect key="frame" x="32" y="0.0" width="311" height="50"/>
-                <subviews>
-                  <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_zengjia" translatesAutoresizingMaskIntoConstraints="NO" id="fce-xE-dhf">
-                    <rect key="frame" x="0.0" y="14" width="22" height="22"/>
-                    <constraints>
-                      <constraint firstAttribute="height" constant="22" id="nfU-kQ-Cuu"/>
-                      <constraint firstAttribute="width" constant="22" id="sK8-rN-1yv"/>
-                    </constraints>
-                  </imageView>
-                  <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新增日历" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Lgr-ZD-kXw">
-                    <rect key="frame" x="38" y="15" width="273" height="20.5"/>
-                    <gestureRecognizers/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="textColor"/>
-                    <nil key="highlightedColor"/>
-                  </label>
-                </subviews>
-              </stackView>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <constraints>
-              <constraint firstItem="9kE-CW-qbe" firstAttribute="leading" secondItem="lIW-wy-yeL" secondAttribute="leadingMargin" constant="16" id="5rg-Vk-iwb"/>
-              <constraint firstAttribute="trailingMargin" secondItem="9kE-CW-qbe" secondAttribute="trailing" constant="16" id="Bjh-rF-QQo"/>
-              <constraint firstItem="9kE-CW-qbe" firstAttribute="top" secondItem="lIW-wy-yeL" secondAttribute="topMargin" id="DIn-lL-K5V"/>
-              <constraint firstAttribute="bottomMargin" secondItem="9kE-CW-qbe" secondAttribute="bottom" id="vQB-at-qUU"/>
-            </constraints>
-            <viewLayoutGuide key="safeArea" id="VP9-5C-v7b"/>
-          </view>
-        </viewController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="6Z9-K4-mSY" userLabel="First Responder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="709.60000000000002" y="-114.24287856071965"/>
-    </scene>
-    <!--Calendar View Controller-->
-    <scene sceneID="k3n-BF-rgt">
-      <objects>
-        <tableViewController id="6hI-Zf-Dol" customClass="OOCalendarViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="m9A-UR-VmU">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <sections>
-              <tableViewSection id="Mag-aW-ELK">
-                <cells>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="ky5-3M-po5">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ky5-3M-po5" id="ey7-OW-MZr">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="例如:我的日历" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="E1I-tu-3OF">
-                          <rect key="frame" x="16" y="10" width="349" height="24"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                      </subviews>
-                      <constraints>
-                        <constraint firstAttribute="trailing" secondItem="E1I-tu-3OF" secondAttribute="trailing" constant="10" id="0zd-rU-i9l"/>
-                        <constraint firstAttribute="bottom" secondItem="E1I-tu-3OF" secondAttribute="bottom" constant="10" id="1Ai-iW-Gr4"/>
-                        <constraint firstItem="E1I-tu-3OF" firstAttribute="leading" secondItem="ey7-OW-MZr" secondAttribute="leading" constant="16" id="ug4-Pk-Lb7"/>
-                        <constraint firstItem="E1I-tu-3OF" firstAttribute="top" secondItem="ey7-OW-MZr" secondAttribute="top" constant="10" id="xW5-Or-ZFH"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="tk5-Hl-mbm">
-                    <rect key="frame" x="0.0" y="72" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tk5-Hl-mbm" id="EZA-d2-7f1">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请选择类型" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6Nq-Qx-KK4">
-                          <rect key="frame" x="16" y="5" width="213" height="34"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GjW-u2-fg5">
-                          <rect key="frame" x="297" y="6" width="31" height="30"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <state key="normal" title="选择"/>
-                          <connections>
-                            <action selector="selectType:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="e5v-uq-r9b"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="imH-Dp-MJa">
-                    <rect key="frame" x="0.0" y="116" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="imH-Dp-MJa" id="Pnd-27-RRL">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="fl8-ZU-9Cp">
-                          <rect key="frame" x="16" y="8" width="50" height="28"/>
-                          <constraints>
-                            <constraint firstAttribute="width" constant="48" id="GYo-gg-b9Y"/>
-                          </constraints>
-                          <connections>
-                            <action selector="tapAllDaySwitch:" destination="Vxk-45-vB1" eventType="valueChanged" id="uyw-pR-SBK"/>
-                          </connections>
-                        </switch>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="915-R7-0Ph">
-                          <rect key="frame" x="74" y="8" width="70" height="28"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                          <nil key="textColor"/>
-                          <nil key="highlightedColor"/>
-                        </label>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="915-R7-0Ph" firstAttribute="leading" secondItem="fl8-ZU-9Cp" secondAttribute="trailing" constant="10" id="6LP-5t-yu6"/>
-                        <constraint firstItem="fl8-ZU-9Cp" firstAttribute="top" secondItem="Pnd-27-RRL" secondAttribute="top" constant="8" id="m1N-gR-9GW"/>
-                        <constraint firstItem="915-R7-0Ph" firstAttribute="top" secondItem="Pnd-27-RRL" secondAttribute="top" constant="8" id="o5r-2x-ZWm"/>
-                        <constraint firstItem="fl8-ZU-9Cp" firstAttribute="leading" secondItem="Pnd-27-RRL" secondAttribute="leading" constant="16" id="od7-nI-vWr"/>
-                        <constraint firstAttribute="bottom" secondItem="fl8-ZU-9Cp" secondAttribute="bottom" constant="8" id="pVF-nh-QnE"/>
-                        <constraint firstAttribute="bottom" secondItem="915-R7-0Ph" secondAttribute="bottom" constant="8" id="rjx-tf-iGC"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="afV-IA-a4y">
-                    <rect key="frame" x="0.0" y="160" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="afV-IA-a4y" id="4vX-Ja-OcF">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="sc4-ds-up5">
-                          <rect key="frame" x="16" y="8" width="349" height="27.5"/>
-                          <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZZL-hY-6YY" userLabel="blue">
-                              <rect key="frame" x="0.0" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="4Zq-Ya-Cty">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="Fcw-yJ-iVq"/>
-                                    <constraint firstAttribute="width" constant="18" id="LGR-Zl-j45"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.25882352939999997" green="0.56078431370000004" blue="0.98823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="height" constant="24" id="X2E-o7-Hl7"/>
-                                <constraint firstItem="4Zq-Ya-Cty" firstAttribute="centerY" secondItem="ZZL-hY-6YY" secondAttribute="centerY" id="bvj-V3-vbS"/>
-                                <constraint firstItem="4Zq-Ya-Cty" firstAttribute="centerX" secondItem="ZZL-hY-6YY" secondAttribute="centerX" id="c7f-RH-KRl"/>
-                                <constraint firstAttribute="width" constant="24" id="eSi-ds-FcL"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NYD-3q-2cV" userLabel="green">
-                              <rect key="frame" x="46.5" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="HeG-XU-b83">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="width" constant="18" id="Idk-aY-FpI"/>
-                                    <constraint firstAttribute="height" constant="18" id="w2Y-0G-V64"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.35686274509999999" green="0.80000000000000004" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="HeG-XU-b83" firstAttribute="centerY" secondItem="NYD-3q-2cV" secondAttribute="centerY" id="6Iz-zC-yuG"/>
-                                <constraint firstAttribute="height" constant="24" id="KDu-a8-a8H"/>
-                                <constraint firstAttribute="width" constant="24" id="OLu-AH-Xss"/>
-                                <constraint firstItem="HeG-XU-b83" firstAttribute="centerX" secondItem="NYD-3q-2cV" secondAttribute="centerX" id="pWl-Hi-P1L"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D56-uh-5fZ" userLabel="orangle">
-                              <rect key="frame" x="93" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="g39-3s-lMM">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="hYd-J9-VyB"/>
-                                    <constraint firstAttribute="width" constant="18" id="qo5-L5-4b2"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.97647058819999999" green="0.74901960779999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="g39-3s-lMM" firstAttribute="centerX" secondItem="D56-uh-5fZ" secondAttribute="centerX" id="SAm-8O-8Qy"/>
-                                <constraint firstAttribute="height" constant="24" id="TQc-uS-y6T"/>
-                                <constraint firstItem="g39-3s-lMM" firstAttribute="centerY" secondItem="D56-uh-5fZ" secondAttribute="centerY" id="cr8-sO-DAu"/>
-                                <constraint firstAttribute="width" constant="24" id="o7H-Zp-ELR"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="woZ-Gb-d4P" userLabel="crimson">
-                              <rect key="frame" x="139.5" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="4kU-pE-6cc">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="7Gi-fy-FPq"/>
-                                    <constraint firstAttribute="width" constant="18" id="H4Q-Xw-YFg"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.96862745100000003" green="0.37254901959999998" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="4kU-pE-6cc" firstAttribute="centerX" secondItem="woZ-Gb-d4P" secondAttribute="centerX" id="ATO-bL-qRR"/>
-                                <constraint firstAttribute="width" constant="24" id="FnE-PG-2ma"/>
-                                <constraint firstItem="4kU-pE-6cc" firstAttribute="centerY" secondItem="woZ-Gb-d4P" secondAttribute="centerY" id="TCZ-Eb-eja"/>
-                                <constraint firstAttribute="height" constant="24" id="Xlk-td-GPN"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yqn-YF-8O7" userLabel="lightpurple">
-                              <rect key="frame" x="185.5" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="s1R-I4-hnF">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="fUV-fB-nwm"/>
-                                    <constraint firstAttribute="width" constant="18" id="uAF-QS-bqm"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.94509803920000002" green="0.50196078430000002" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="height" constant="24" id="B2G-ZS-kx2"/>
-                                <constraint firstItem="s1R-I4-hnF" firstAttribute="centerY" secondItem="yqn-YF-8O7" secondAttribute="centerY" id="F6f-lB-X3R"/>
-                                <constraint firstItem="s1R-I4-hnF" firstAttribute="centerX" secondItem="yqn-YF-8O7" secondAttribute="centerX" id="PUB-qH-aE6"/>
-                                <constraint firstAttribute="width" constant="24" id="S0L-3x-4x2"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JiP-uY-CBd" userLabel="purple">
-                              <rect key="frame" x="232" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="29t-6S-Hlb">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="width" constant="18" id="JBI-jM-OBE"/>
-                                    <constraint firstAttribute="height" constant="18" id="ilL-Cn-r8J"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.56470588239999997" green="0.44705882349999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstItem="29t-6S-Hlb" firstAttribute="centerX" secondItem="JiP-uY-CBd" secondAttribute="centerX" id="BVU-WV-f1d"/>
-                                <constraint firstAttribute="width" constant="24" id="FYA-DA-JpN"/>
-                                <constraint firstAttribute="height" constant="24" id="Q9u-5Y-iYr"/>
-                                <constraint firstItem="29t-6S-Hlb" firstAttribute="centerY" secondItem="JiP-uY-CBd" secondAttribute="centerY" id="g7A-xs-AxP"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rKC-SP-A0D" userLabel="gray">
-                              <rect key="frame" x="278.5" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="li5-KM-yd4">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="Sd2-xX-C2A"/>
-                                    <constraint firstAttribute="width" constant="18" id="bQi-Yf-rGw"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.56470588239999997" green="0.56470588239999997" blue="0.56470588239999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="width" constant="24" id="06B-K1-xFi"/>
-                                <constraint firstItem="li5-KM-yd4" firstAttribute="centerX" secondItem="rKC-SP-A0D" secondAttribute="centerX" id="esH-dd-mLK"/>
-                                <constraint firstAttribute="height" constant="24" id="xye-1s-JaE"/>
-                                <constraint firstItem="li5-KM-yd4" firstAttribute="centerY" secondItem="rKC-SP-A0D" secondAttribute="centerY" id="yDt-LZ-FMl"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                            <view tag="7" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T4I-Zn-V9w" userLabel="cyanine">
-                              <rect key="frame" x="325" y="2" width="24" height="24"/>
-                              <subviews>
-                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="nx0-x2-HnL">
-                                  <rect key="frame" x="3" y="3" width="18" height="18"/>
-                                  <constraints>
-                                    <constraint firstAttribute="height" constant="18" id="ZZD-of-lra"/>
-                                    <constraint firstAttribute="width" constant="18" id="zM0-w1-q9Q"/>
-                                  </constraints>
-                                </imageView>
-                              </subviews>
-                              <color key="backgroundColor" red="0.078431372550000003" green="0.38431372549999998" blue="0.74509803919999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                              <constraints>
-                                <constraint firstAttribute="height" constant="24" id="342-MO-tsM"/>
-                                <constraint firstItem="nx0-x2-HnL" firstAttribute="centerX" secondItem="T4I-Zn-V9w" secondAttribute="centerX" id="Laq-Vq-kDh"/>
-                                <constraint firstItem="nx0-x2-HnL" firstAttribute="centerY" secondItem="T4I-Zn-V9w" secondAttribute="centerY" id="RCd-Hw-gdu"/>
-                                <constraint firstAttribute="width" constant="24" id="cEt-IQ-FHo"/>
-                              </constraints>
-                              <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                  <real key="value" value="12"/>
-                                </userDefinedRuntimeAttribute>
-                              </userDefinedRuntimeAttributes>
-                            </view>
-                          </subviews>
-                        </stackView>
-                      </subviews>
-                      <constraints>
-                        <constraint firstAttribute="bottom" secondItem="sc4-ds-up5" secondAttribute="bottom" constant="8" id="BJ9-sN-hUK"/>
-                        <constraint firstAttribute="trailing" secondItem="sc4-ds-up5" secondAttribute="trailing" constant="10" id="QYU-vK-aEh"/>
-                        <constraint firstItem="sc4-ds-up5" firstAttribute="leading" secondItem="4vX-Ja-OcF" secondAttribute="leading" constant="16" id="meC-wG-0Ge"/>
-                        <constraint firstItem="sc4-ds-up5" firstAttribute="top" secondItem="4vX-Ja-OcF" secondAttribute="top" constant="8" id="q1X-8e-Shr"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="100" id="w3N-VO-khd">
-                    <rect key="frame" x="0.0" y="204" width="375" height="100"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="w3N-VO-khd" id="HdW-WP-zq7">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" placeholder="添加说明" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0zU-2p-l4e">
-                          <rect key="frame" x="16" y="8" width="349" height="54"/>
-                          <constraints>
-                            <constraint firstAttribute="height" constant="40" id="Ryd-Gz-Ta1"/>
-                          </constraints>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                      </subviews>
-                      <constraints>
-                        <constraint firstItem="0zU-2p-l4e" firstAttribute="top" secondItem="HdW-WP-zq7" secondAttribute="top" constant="8" id="GIN-dS-e04"/>
-                        <constraint firstAttribute="trailing" secondItem="0zU-2p-l4e" secondAttribute="trailing" constant="10" id="hS1-Op-3lS"/>
-                        <constraint firstItem="0zU-2p-l4e" firstAttribute="leading" secondItem="HdW-WP-zq7" secondAttribute="leading" constant="16" id="jEy-xu-Vbz"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                </cells>
-              </tableViewSection>
-              <tableViewSection id="j8W-2y-K1h">
-                <cells>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="b9Z-Ey-cMh">
-                    <rect key="frame" x="0.0" y="360" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="b9Z-Ey-cMh" id="SSH-zn-oXh">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择所属组织" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vpF-O7-lvf">
-                          <rect key="frame" x="16" y="5" width="213" height="34"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kae-RP-FyB">
-                          <rect key="frame" x="297" y="6" width="31" height="30"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <state key="normal" title="选择"/>
-                          <connections>
-                            <action selector="selectOrg:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="ZXk-NJ-BD5"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="sb3-wz-V5h">
-                    <rect key="frame" x="0.0" y="404" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sb3-wz-V5h" id="iOf-91-Mpo">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择管理者" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bIB-vr-JmD">
-                          <rect key="frame" x="16" y="5" width="213" height="34"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m4R-gF-vOd">
-                          <rect key="frame" x="297" y="6" width="35" height="30"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <state key="normal" title="选择"/>
-                          <connections>
-                            <action selector="selectManager:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="YIp-nK-zaa"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="xjH-ft-A13">
-                    <rect key="frame" x="0.0" y="448" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="xjH-ft-A13" id="08M-eV-Wtw">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择可见范围" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5RB-dp-23j">
-                          <rect key="frame" x="16" y="5" width="213" height="34"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-Ws-oZH">
-                          <rect key="frame" x="297" y="6" width="31" height="30"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <state key="normal" title="选择"/>
-                          <connections>
-                            <action selector="selectScope:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="5LG-bo-Jk1"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="bqR-JX-7Hn">
-                    <rect key="frame" x="0.0" y="492" width="375" height="44"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bqR-JX-7Hn" id="uYh-KG-FIU">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择可新建范围" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HYK-cG-NOj">
-                          <rect key="frame" x="16" y="5" width="213" height="34"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                          <textInputTraits key="textInputTraits"/>
-                        </textField>
-                        <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ueU-we-edj">
-                          <rect key="frame" x="297" y="6" width="31" height="30"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <state key="normal" title="选择"/>
-                          <connections>
-                            <action selector="selectNewScope:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="yAx-yD-Esr"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                </cells>
-              </tableViewSection>
-              <tableViewSection id="kqD-jf-4p2">
-                <cells>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="49" id="M17-7p-CgG">
-                    <rect key="frame" x="0.0" y="592" width="375" height="49"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="M17-7p-CgG" id="W0o-2J-yuQ">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="是否启用" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qf3-2G-kRZ">
-                          <rect key="frame" x="64" y="14" width="70" height="21"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                          <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                          <nil key="textColor"/>
-                          <nil key="highlightedColor"/>
-                        </label>
-                        <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GTC-NP-gGg">
-                          <rect key="frame" x="9" y="9" width="49" height="31"/>
-                          <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        </switch>
-                      </subviews>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                  <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="113" id="8mT-v2-Qx8">
-                    <rect key="frame" x="0.0" y="641" width="375" height="113"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8mT-v2-Qx8" id="87S-Cm-kNa">
-                      <rect key="frame" x="0.0" y="0.0" width="375" height="113"/>
-                      <autoresizingMask key="autoresizingMask"/>
-                      <subviews>
-                        <button hidden="YES" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ceC-iW-RJC">
-                          <rect key="frame" x="10" y="30" width="343" height="40"/>
-                          <color key="backgroundColor" red="0.98431372549999996" green="0.2784313725" blue="0.2784313725" alpha="1" colorSpace="calibratedRGB"/>
-                          <constraints>
-                            <constraint firstAttribute="height" constant="40" id="hsv-E0-CNX"/>
-                          </constraints>
-                          <state key="normal" title="删   除">
-                            <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                          </state>
-                          <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                              <real key="value" value="5"/>
-                            </userDefinedRuntimeAttribute>
-                          </userDefinedRuntimeAttributes>
-                          <connections>
-                            <action selector="deleteBtnTap:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="Xes-eC-VfF"/>
-                            <action selector="tapDeleteBtn:" destination="Vxk-45-vB1" eventType="touchUpInside" id="IFP-6l-1ZD"/>
-                          </connections>
-                        </button>
-                      </subviews>
-                      <constraints>
-                        <constraint firstAttribute="trailing" secondItem="ceC-iW-RJC" secondAttribute="trailing" constant="16" id="Hrn-eU-isu"/>
-                        <constraint firstItem="ceC-iW-RJC" firstAttribute="leading" secondItem="87S-Cm-kNa" secondAttribute="leading" constant="16" id="clh-qU-E5h"/>
-                        <constraint firstItem="ceC-iW-RJC" firstAttribute="centerY" secondItem="87S-Cm-kNa" secondAttribute="centerY" id="eix-O3-ypw"/>
-                      </constraints>
-                    </tableViewCellContentView>
-                  </tableViewCell>
-                </cells>
-              </tableViewSection>
-            </sections>
-            <connections>
-              <outlet property="dataSource" destination="6hI-Zf-Dol" id="q6S-ea-AMu"/>
-              <outlet property="delegate" destination="6hI-Zf-Dol" id="ugR-8t-BpE"/>
-            </connections>
-          </tableView>
-          <connections>
-            <outlet property="calendarColorStackView" destination="sc4-ds-up5" id="M83-qQ-5Dg"/>
-            <outlet property="calendarDeleteBtn" destination="ceC-iW-RJC" id="hSl-e9-yib"/>
-            <outlet property="calendarIsOpenBtn" destination="GjW-u2-fg5" id="qt3-Vs-Ni9"/>
-            <outlet property="calendarIsOpenSwitch" destination="fl8-ZU-9Cp" id="B0z-eA-yDa"/>
-            <outlet property="calendarManagerField" destination="bIB-vr-JmD" id="vj2-pN-AIk"/>
-            <outlet property="calendarNameField" destination="E1I-tu-3OF" id="43n-JC-CE2"/>
-            <outlet property="calendarNewScopeField" destination="HYK-cG-NOj" id="fM2-GR-Qdc"/>
-            <outlet property="calendarOrgField" destination="vpF-O7-lvf" id="ZMu-T3-6gU"/>
-            <outlet property="calendarRemarkField" destination="0zU-2p-l4e" id="ia9-f3-lRI"/>
-            <outlet property="calendarScopeField" destination="5RB-dp-23j" id="NOM-Ib-Knt"/>
-            <outlet property="calendarStatusSwitch" destination="GTC-NP-gGg" id="AON-0O-FAD"/>
-            <outlet property="calendarTypeField" destination="6Nq-Qx-KK4" id="ONT-gF-LlR"/>
-          </connections>
-        </tableViewController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="Kl7-oF-Qbs" userLabel="First Responder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="1648.8" y="97.601199400299862"/>
-    </scene>
-    <!--编辑内容-->
-    <scene sceneID="d6n-Ns-IYR">
-      <objects>
-        <viewController id="ADR-Nz-B0R" customClass="OOCalendarEditRemarkViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <view key="view" contentMode="scaleToFill" id="uZ4-K3-7u9">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-            <viewLayoutGuide key="safeArea" id="x7Q-Xj-laR"/>
-          </view>
-          <navigationItem key="navigationItem" title="编辑内容" id="8m9-cj-hJa">
-            <barButtonItem key="leftBarButtonItem" title="取消" landscapeImage="icon_off_grey" id="Nbx-21-hlf">
-              <connections>
-                <action selector="cancel:" destination="ADR-Nz-B0R" id="xBm-rt-txj"/>
-              </connections>
-            </barButtonItem>
-            <barButtonItem key="rightBarButtonItem" title="保存" id="LXv-Cs-Ybf">
-              <connections>
-                <action selector="save:" destination="ADR-Nz-B0R" id="Y1a-tK-EiQ"/>
-              </connections>
-            </barButtonItem>
-          </navigationItem>
-        </viewController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="KZu-Ft-RRO" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="3342" y="-716"/>
-    </scene>
-    <!--Navigation Controller-->
-    <scene sceneID="NvP-o5-zSv">
-      <objects>
-        <navigationController automaticallyAdjustsScrollViewInsets="NO" id="LoN-sU-f4i" customClass="ZLNavigationController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
-          <toolbarItems/>
-          <navigationItem key="navigationItem" id="57p-JL-s0t"/>
-          <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Pux-od-ZUE">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
-            <autoresizingMask key="autoresizingMask"/>
-          </navigationBar>
-          <nil name="viewControllers"/>
-          <connections>
-            <segue destination="ADR-Nz-B0R" kind="relationship" relationship="rootViewController" id="c9K-2a-rzE"/>
-          </connections>
-        </navigationController>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="irf-LL-qwe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-      </objects>
-      <point key="canvasLocation" x="2622" y="-703"/>
-    </scene>
-  </scenes>
-  <resources>
-    <image name="check" width="23" height="20"/>
-    <image name="icon_arrow" width="22" height="22"/>
-    <image name="icon_chongfu" width="22" height="22"/>
-    <image name="icon_hdjr" width="22" height="22"/>
-    <image name="icon_off_grey" width="22" height="22"/>
-    <image name="icon_shijian" width="22" height="22"/>
-    <image name="icon_tixing" width="22" height="22"/>
-    <image name="icon_zengjia" width="22" height="22"/>
-  </resources>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="6Z9-K4-mSY" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="709.60000000000002" y="-114.24287856071965"/>
+        </scene>
+        <!--Calendar View Controller-->
+        <scene sceneID="k3n-BF-rgt">
+            <objects>
+                <tableViewController id="6hI-Zf-Dol" customClass="OOCalendarViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="m9A-UR-VmU">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <sections>
+                            <tableViewSection id="Mag-aW-ELK">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="ky5-3M-po5">
+                                        <rect key="frame" x="0.0" y="28" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ky5-3M-po5" id="ey7-OW-MZr">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="例如:我的日历" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="E1I-tu-3OF">
+                                                    <rect key="frame" x="16" y="10" width="349" height="24"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="E1I-tu-3OF" secondAttribute="trailing" constant="10" id="0zd-rU-i9l"/>
+                                                <constraint firstAttribute="bottom" secondItem="E1I-tu-3OF" secondAttribute="bottom" constant="10" id="1Ai-iW-Gr4"/>
+                                                <constraint firstItem="E1I-tu-3OF" firstAttribute="leading" secondItem="ey7-OW-MZr" secondAttribute="leading" constant="16" id="ug4-Pk-Lb7"/>
+                                                <constraint firstItem="E1I-tu-3OF" firstAttribute="top" secondItem="ey7-OW-MZr" secondAttribute="top" constant="10" id="xW5-Or-ZFH"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="tk5-Hl-mbm">
+                                        <rect key="frame" x="0.0" y="72" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="tk5-Hl-mbm" id="EZA-d2-7f1">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请选择类型" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6Nq-Qx-KK4">
+                                                    <rect key="frame" x="16" y="6" width="291" height="32"/>
+                                                    <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GjW-u2-fg5">
+                                                    <rect key="frame" x="319" y="6" width="32" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="32" id="W9a-KM-Bba"/>
+                                                        <constraint firstAttribute="width" constant="32" id="rno-Bo-Yb6"/>
+                                                    </constraints>
+                                                    <state key="normal" title="选择"/>
+                                                    <connections>
+                                                        <action selector="selectType:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="e5v-uq-r9b"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="bottom" secondItem="6Nq-Qx-KK4" secondAttribute="bottom" constant="6" id="AIZ-wd-7mK"/>
+                                                <constraint firstItem="GjW-u2-fg5" firstAttribute="top" secondItem="EZA-d2-7f1" secondAttribute="top" constant="6" id="MIe-qp-SqM"/>
+                                                <constraint firstAttribute="trailing" secondItem="GjW-u2-fg5" secondAttribute="trailing" constant="24" id="YZn-fx-RPo"/>
+                                                <constraint firstItem="GjW-u2-fg5" firstAttribute="leading" secondItem="6Nq-Qx-KK4" secondAttribute="trailing" constant="12" id="aCh-YM-UYH"/>
+                                                <constraint firstItem="6Nq-Qx-KK4" firstAttribute="top" secondItem="EZA-d2-7f1" secondAttribute="top" constant="6" id="aY8-2v-BEC"/>
+                                                <constraint firstAttribute="bottom" secondItem="GjW-u2-fg5" secondAttribute="bottom" constant="6" id="dTF-AD-Pg2"/>
+                                                <constraint firstItem="6Nq-Qx-KK4" firstAttribute="leading" secondItem="EZA-d2-7f1" secondAttribute="leading" constant="16" id="yoT-K7-DXN"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="imH-Dp-MJa">
+                                        <rect key="frame" x="0.0" y="116" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="imH-Dp-MJa" id="Pnd-27-RRL">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="fl8-ZU-9Cp">
+                                                    <rect key="frame" x="16" y="8" width="50" height="28"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="48" id="GYo-gg-b9Y"/>
+                                                    </constraints>
+                                                    <connections>
+                                                        <action selector="tapAllDaySwitch:" destination="Vxk-45-vB1" eventType="valueChanged" id="uyw-pR-SBK"/>
+                                                    </connections>
+                                                </switch>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否公开" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="915-R7-0Ph">
+                                                    <rect key="frame" x="74" y="8" width="70" height="28"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="915-R7-0Ph" firstAttribute="leading" secondItem="fl8-ZU-9Cp" secondAttribute="trailing" constant="10" id="6LP-5t-yu6"/>
+                                                <constraint firstItem="fl8-ZU-9Cp" firstAttribute="top" secondItem="Pnd-27-RRL" secondAttribute="top" constant="8" id="m1N-gR-9GW"/>
+                                                <constraint firstItem="915-R7-0Ph" firstAttribute="top" secondItem="Pnd-27-RRL" secondAttribute="top" constant="8" id="o5r-2x-ZWm"/>
+                                                <constraint firstItem="fl8-ZU-9Cp" firstAttribute="leading" secondItem="Pnd-27-RRL" secondAttribute="leading" constant="16" id="od7-nI-vWr"/>
+                                                <constraint firstAttribute="bottom" secondItem="fl8-ZU-9Cp" secondAttribute="bottom" constant="8" id="pVF-nh-QnE"/>
+                                                <constraint firstAttribute="bottom" secondItem="915-R7-0Ph" secondAttribute="bottom" constant="8" id="rjx-tf-iGC"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="afV-IA-a4y">
+                                        <rect key="frame" x="0.0" y="160" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="afV-IA-a4y" id="4vX-Ja-OcF">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="sc4-ds-up5">
+                                                    <rect key="frame" x="16" y="8" width="349" height="27.5"/>
+                                                    <subviews>
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZZL-hY-6YY" userLabel="blue">
+                                                            <rect key="frame" x="0.0" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="4Zq-Ya-Cty">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="Fcw-yJ-iVq"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="LGR-Zl-j45"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.25882352939999997" green="0.56078431370000004" blue="0.98823529409999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="24" id="X2E-o7-Hl7"/>
+                                                                <constraint firstItem="4Zq-Ya-Cty" firstAttribute="centerY" secondItem="ZZL-hY-6YY" secondAttribute="centerY" id="bvj-V3-vbS"/>
+                                                                <constraint firstItem="4Zq-Ya-Cty" firstAttribute="centerX" secondItem="ZZL-hY-6YY" secondAttribute="centerX" id="c7f-RH-KRl"/>
+                                                                <constraint firstAttribute="width" constant="24" id="eSi-ds-FcL"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="1" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NYD-3q-2cV" userLabel="green">
+                                                            <rect key="frame" x="46.5" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="HeG-XU-b83">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="18" id="Idk-aY-FpI"/>
+                                                                        <constraint firstAttribute="height" constant="18" id="w2Y-0G-V64"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.35686274509999999" green="0.80000000000000004" blue="0.3803921569" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="HeG-XU-b83" firstAttribute="centerY" secondItem="NYD-3q-2cV" secondAttribute="centerY" id="6Iz-zC-yuG"/>
+                                                                <constraint firstAttribute="height" constant="24" id="KDu-a8-a8H"/>
+                                                                <constraint firstAttribute="width" constant="24" id="OLu-AH-Xss"/>
+                                                                <constraint firstItem="HeG-XU-b83" firstAttribute="centerX" secondItem="NYD-3q-2cV" secondAttribute="centerX" id="pWl-Hi-P1L"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="2" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="D56-uh-5fZ" userLabel="orangle">
+                                                            <rect key="frame" x="93" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="g39-3s-lMM">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="hYd-J9-VyB"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="qo5-L5-4b2"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.97647058819999999" green="0.74901960779999999" blue="0.14117647059999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="g39-3s-lMM" firstAttribute="centerX" secondItem="D56-uh-5fZ" secondAttribute="centerX" id="SAm-8O-8Qy"/>
+                                                                <constraint firstAttribute="height" constant="24" id="TQc-uS-y6T"/>
+                                                                <constraint firstItem="g39-3s-lMM" firstAttribute="centerY" secondItem="D56-uh-5fZ" secondAttribute="centerY" id="cr8-sO-DAu"/>
+                                                                <constraint firstAttribute="width" constant="24" id="o7H-Zp-ELR"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="3" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="woZ-Gb-d4P" userLabel="crimson">
+                                                            <rect key="frame" x="139.5" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="4kU-pE-6cc">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="7Gi-fy-FPq"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="H4Q-Xw-YFg"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.96862745100000003" green="0.37254901959999998" blue="0.34901960780000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="4kU-pE-6cc" firstAttribute="centerX" secondItem="woZ-Gb-d4P" secondAttribute="centerX" id="ATO-bL-qRR"/>
+                                                                <constraint firstAttribute="width" constant="24" id="FnE-PG-2ma"/>
+                                                                <constraint firstItem="4kU-pE-6cc" firstAttribute="centerY" secondItem="woZ-Gb-d4P" secondAttribute="centerY" id="TCZ-Eb-eja"/>
+                                                                <constraint firstAttribute="height" constant="24" id="Xlk-td-GPN"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="4" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yqn-YF-8O7" userLabel="lightpurple">
+                                                            <rect key="frame" x="185.5" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="s1R-I4-hnF">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="fUV-fB-nwm"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="uAF-QS-bqm"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.94509803920000002" green="0.50196078430000002" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="24" id="B2G-ZS-kx2"/>
+                                                                <constraint firstItem="s1R-I4-hnF" firstAttribute="centerY" secondItem="yqn-YF-8O7" secondAttribute="centerY" id="F6f-lB-X3R"/>
+                                                                <constraint firstItem="s1R-I4-hnF" firstAttribute="centerX" secondItem="yqn-YF-8O7" secondAttribute="centerX" id="PUB-qH-aE6"/>
+                                                                <constraint firstAttribute="width" constant="24" id="S0L-3x-4x2"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JiP-uY-CBd" userLabel="purple">
+                                                            <rect key="frame" x="232" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="29t-6S-Hlb">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="width" constant="18" id="JBI-jM-OBE"/>
+                                                                        <constraint firstAttribute="height" constant="18" id="ilL-Cn-r8J"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.56470588239999997" green="0.44705882349999998" blue="0.94509803920000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstItem="29t-6S-Hlb" firstAttribute="centerX" secondItem="JiP-uY-CBd" secondAttribute="centerX" id="BVU-WV-f1d"/>
+                                                                <constraint firstAttribute="width" constant="24" id="FYA-DA-JpN"/>
+                                                                <constraint firstAttribute="height" constant="24" id="Q9u-5Y-iYr"/>
+                                                                <constraint firstItem="29t-6S-Hlb" firstAttribute="centerY" secondItem="JiP-uY-CBd" secondAttribute="centerY" id="g7A-xs-AxP"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="6" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rKC-SP-A0D" userLabel="gray">
+                                                            <rect key="frame" x="278.5" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="li5-KM-yd4">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="Sd2-xX-C2A"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="bQi-Yf-rGw"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.56470588239999997" green="0.56470588239999997" blue="0.56470588239999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="24" id="06B-K1-xFi"/>
+                                                                <constraint firstItem="li5-KM-yd4" firstAttribute="centerX" secondItem="rKC-SP-A0D" secondAttribute="centerX" id="esH-dd-mLK"/>
+                                                                <constraint firstAttribute="height" constant="24" id="xye-1s-JaE"/>
+                                                                <constraint firstItem="li5-KM-yd4" firstAttribute="centerY" secondItem="rKC-SP-A0D" secondAttribute="centerY" id="yDt-LZ-FMl"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                        <view tag="7" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T4I-Zn-V9w" userLabel="cyanine">
+                                                            <rect key="frame" x="325" y="2" width="24" height="24"/>
+                                                            <subviews>
+                                                                <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="nx0-x2-HnL">
+                                                                    <rect key="frame" x="3" y="3" width="18" height="18"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="18" id="ZZD-of-lra"/>
+                                                                        <constraint firstAttribute="width" constant="18" id="zM0-w1-q9Q"/>
+                                                                    </constraints>
+                                                                </imageView>
+                                                            </subviews>
+                                                            <color key="backgroundColor" red="0.078431372550000003" green="0.38431372549999998" blue="0.74509803919999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="height" constant="24" id="342-MO-tsM"/>
+                                                                <constraint firstItem="nx0-x2-HnL" firstAttribute="centerX" secondItem="T4I-Zn-V9w" secondAttribute="centerX" id="Laq-Vq-kDh"/>
+                                                                <constraint firstItem="nx0-x2-HnL" firstAttribute="centerY" secondItem="T4I-Zn-V9w" secondAttribute="centerY" id="RCd-Hw-gdu"/>
+                                                                <constraint firstAttribute="width" constant="24" id="cEt-IQ-FHo"/>
+                                                            </constraints>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                    <real key="value" value="12"/>
+                                                                </userDefinedRuntimeAttribute>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
+                                                    </subviews>
+                                                </stackView>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="bottom" secondItem="sc4-ds-up5" secondAttribute="bottom" constant="8" id="BJ9-sN-hUK"/>
+                                                <constraint firstAttribute="trailing" secondItem="sc4-ds-up5" secondAttribute="trailing" constant="10" id="QYU-vK-aEh"/>
+                                                <constraint firstItem="sc4-ds-up5" firstAttribute="leading" secondItem="4vX-Ja-OcF" secondAttribute="leading" constant="16" id="meC-wG-0Ge"/>
+                                                <constraint firstItem="sc4-ds-up5" firstAttribute="top" secondItem="4vX-Ja-OcF" secondAttribute="top" constant="8" id="q1X-8e-Shr"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="100" id="w3N-VO-khd">
+                                        <rect key="frame" x="0.0" y="204" width="375" height="100"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="w3N-VO-khd" id="HdW-WP-zq7">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" placeholder="添加说明" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0zU-2p-l4e">
+                                                    <rect key="frame" x="16" y="8" width="349" height="84"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="0zU-2p-l4e" firstAttribute="top" secondItem="HdW-WP-zq7" secondAttribute="top" constant="8" id="GIN-dS-e04"/>
+                                                <constraint firstAttribute="bottom" secondItem="0zU-2p-l4e" secondAttribute="bottom" constant="8" id="MwG-oM-3zj"/>
+                                                <constraint firstAttribute="trailing" secondItem="0zU-2p-l4e" secondAttribute="trailing" constant="10" id="hS1-Op-3lS"/>
+                                                <constraint firstItem="0zU-2p-l4e" firstAttribute="leading" secondItem="HdW-WP-zq7" secondAttribute="leading" constant="16" id="jEy-xu-Vbz"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                            <tableViewSection id="j8W-2y-K1h">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="b9Z-Ey-cMh">
+                                        <rect key="frame" x="0.0" y="360" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="b9Z-Ey-cMh" id="SSH-zn-oXh">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择所属组织" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vpF-O7-lvf">
+                                                    <rect key="frame" x="16" y="6" width="291" height="32"/>
+                                                    <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kae-RP-FyB">
+                                                    <rect key="frame" x="319" y="6" width="32" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="32" id="Hwl-ng-8iq"/>
+                                                        <constraint firstAttribute="height" constant="32" id="ZuX-YZ-s8I"/>
+                                                    </constraints>
+                                                    <state key="normal" title="选择"/>
+                                                    <connections>
+                                                        <action selector="selectOrg:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="ZXk-NJ-BD5"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="vpF-O7-lvf" firstAttribute="top" secondItem="SSH-zn-oXh" secondAttribute="top" constant="6" id="J2T-eN-he2"/>
+                                                <constraint firstItem="kae-RP-FyB" firstAttribute="top" secondItem="SSH-zn-oXh" secondAttribute="top" constant="6" id="Q0R-ZW-QPM"/>
+                                                <constraint firstAttribute="bottom" secondItem="kae-RP-FyB" secondAttribute="bottom" constant="6" id="Q2f-Im-2VI"/>
+                                                <constraint firstAttribute="trailing" secondItem="kae-RP-FyB" secondAttribute="trailing" constant="24" id="S3M-PM-Qan"/>
+                                                <constraint firstItem="kae-RP-FyB" firstAttribute="leading" secondItem="vpF-O7-lvf" secondAttribute="trailing" constant="12" id="ZdW-3y-eX1"/>
+                                                <constraint firstAttribute="bottom" secondItem="vpF-O7-lvf" secondAttribute="bottom" constant="6" id="gkU-as-WY8"/>
+                                                <constraint firstItem="vpF-O7-lvf" firstAttribute="leading" secondItem="SSH-zn-oXh" secondAttribute="leading" constant="16" id="iuw-nj-CGt"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="sb3-wz-V5h">
+                                        <rect key="frame" x="0.0" y="404" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sb3-wz-V5h" id="iOf-91-Mpo">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择管理者" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bIB-vr-JmD">
+                                                    <rect key="frame" x="16" y="6" width="291" height="32"/>
+                                                    <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m4R-gF-vOd">
+                                                    <rect key="frame" x="319" y="6" width="32" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="32" id="L1T-hn-46f"/>
+                                                        <constraint firstAttribute="height" constant="32" id="TkP-zZ-3HE"/>
+                                                    </constraints>
+                                                    <state key="normal" title="选择"/>
+                                                    <connections>
+                                                        <action selector="selectManager:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="YIp-nK-zaa"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="bIB-vr-JmD" firstAttribute="leading" secondItem="iOf-91-Mpo" secondAttribute="leading" constant="16" id="4ou-CN-BP7"/>
+                                                <constraint firstAttribute="bottom" secondItem="m4R-gF-vOd" secondAttribute="bottom" constant="6" id="LoN-Hb-nig"/>
+                                                <constraint firstAttribute="trailing" secondItem="m4R-gF-vOd" secondAttribute="trailing" constant="24" id="UfC-cM-iMM"/>
+                                                <constraint firstItem="m4R-gF-vOd" firstAttribute="top" secondItem="iOf-91-Mpo" secondAttribute="top" constant="6" id="XNp-6R-SxO"/>
+                                                <constraint firstItem="m4R-gF-vOd" firstAttribute="leading" secondItem="bIB-vr-JmD" secondAttribute="trailing" constant="12" id="cd8-WC-7bV"/>
+                                                <constraint firstItem="bIB-vr-JmD" firstAttribute="top" secondItem="iOf-91-Mpo" secondAttribute="top" constant="6" id="yY4-uT-gAH"/>
+                                                <constraint firstAttribute="bottom" secondItem="bIB-vr-JmD" secondAttribute="bottom" constant="6" id="zyh-ec-dAC"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="xjH-ft-A13">
+                                        <rect key="frame" x="0.0" y="448" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="xjH-ft-A13" id="08M-eV-Wtw">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择可见范围" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5RB-dp-23j">
+                                                    <rect key="frame" x="16" y="6" width="291" height="32"/>
+                                                    <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yrc-Ws-oZH">
+                                                    <rect key="frame" x="319" y="6" width="32" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="32" id="Xvt-5E-w3M"/>
+                                                        <constraint firstAttribute="width" constant="32" id="qzS-jN-n7Y"/>
+                                                    </constraints>
+                                                    <state key="normal" title="选择"/>
+                                                    <connections>
+                                                        <action selector="selectScope:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="5LG-bo-Jk1"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="Yrc-Ws-oZH" firstAttribute="leading" secondItem="5RB-dp-23j" secondAttribute="trailing" constant="12" id="2Qr-rg-Acn"/>
+                                                <constraint firstItem="5RB-dp-23j" firstAttribute="top" secondItem="08M-eV-Wtw" secondAttribute="top" constant="6" id="YWf-Jz-SB5"/>
+                                                <constraint firstItem="5RB-dp-23j" firstAttribute="leading" secondItem="08M-eV-Wtw" secondAttribute="leading" constant="16" id="c3A-It-22P"/>
+                                                <constraint firstAttribute="bottom" secondItem="5RB-dp-23j" secondAttribute="bottom" constant="6" id="ggd-Id-8Ql"/>
+                                                <constraint firstAttribute="bottom" secondItem="Yrc-Ws-oZH" secondAttribute="bottom" constant="6" id="nG1-Sd-yel"/>
+                                                <constraint firstItem="Yrc-Ws-oZH" firstAttribute="top" secondItem="08M-eV-Wtw" secondAttribute="top" constant="6" id="olv-zV-pqA"/>
+                                                <constraint firstAttribute="trailing" secondItem="Yrc-Ws-oZH" secondAttribute="trailing" constant="24" id="zUH-nC-fcT"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" id="bqR-JX-7Hn">
+                                        <rect key="frame" x="0.0" y="492" width="375" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bqR-JX-7Hn" id="uYh-KG-FIU">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="选择可新建范围" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HYK-cG-NOj">
+                                                    <rect key="frame" x="16" y="6" width="291" height="32"/>
+                                                    <accessibility key="accessibilityConfiguration" identifier="calendarType"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <textInputTraits key="textInputTraits"/>
+                                                </textField>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ueU-we-edj">
+                                                    <rect key="frame" x="319" y="6" width="32" height="32"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="32" id="LGG-fL-DaH"/>
+                                                        <constraint firstAttribute="height" constant="32" id="WoG-4j-BlE"/>
+                                                    </constraints>
+                                                    <state key="normal" title="选择"/>
+                                                    <connections>
+                                                        <action selector="selectNewScope:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="yAx-yD-Esr"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="ueU-we-edj" firstAttribute="top" secondItem="uYh-KG-FIU" secondAttribute="top" constant="6" id="0QB-av-9Fw"/>
+                                                <constraint firstAttribute="bottom" secondItem="ueU-we-edj" secondAttribute="bottom" constant="6" id="1Ed-sZ-eSS"/>
+                                                <constraint firstItem="HYK-cG-NOj" firstAttribute="leading" secondItem="uYh-KG-FIU" secondAttribute="leading" constant="16" id="H6R-aE-WPo"/>
+                                                <constraint firstAttribute="trailing" secondItem="ueU-we-edj" secondAttribute="trailing" constant="24" id="JgJ-Gq-FTQ"/>
+                                                <constraint firstItem="HYK-cG-NOj" firstAttribute="top" secondItem="uYh-KG-FIU" secondAttribute="top" constant="6" id="XlS-j1-UkW"/>
+                                                <constraint firstItem="ueU-we-edj" firstAttribute="leading" secondItem="HYK-cG-NOj" secondAttribute="trailing" constant="12" id="i3z-wh-vsK"/>
+                                                <constraint firstAttribute="bottom" secondItem="HYK-cG-NOj" secondAttribute="bottom" constant="6" id="wJ6-a2-pUy"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                            <tableViewSection id="kqD-jf-4p2">
+                                <cells>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="49" id="M17-7p-CgG">
+                                        <rect key="frame" x="0.0" y="592" width="375" height="49"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="M17-7p-CgG" id="W0o-2J-yuQ">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="是否启用" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qf3-2G-kRZ">
+                                                    <rect key="frame" x="74" y="19" width="70" height="11"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GTC-NP-gGg">
+                                                    <rect key="frame" x="16" y="8" width="50" height="33"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="48" id="Zlt-Uy-Ej7"/>
+                                                    </constraints>
+                                                </switch>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="bottomMargin" secondItem="qf3-2G-kRZ" secondAttribute="bottom" constant="8" id="GjC-rC-dNw"/>
+                                                <constraint firstItem="qf3-2G-kRZ" firstAttribute="top" secondItem="W0o-2J-yuQ" secondAttribute="topMargin" constant="8" id="Oda-cU-M70"/>
+                                                <constraint firstItem="GTC-NP-gGg" firstAttribute="leading" secondItem="W0o-2J-yuQ" secondAttribute="leading" constant="16" id="goD-5C-BW3"/>
+                                                <constraint firstItem="GTC-NP-gGg" firstAttribute="top" secondItem="W0o-2J-yuQ" secondAttribute="top" constant="8" id="v4N-sc-Chi"/>
+                                                <constraint firstItem="qf3-2G-kRZ" firstAttribute="leading" secondItem="GTC-NP-gGg" secondAttribute="trailing" constant="10" id="xtU-RP-ae1"/>
+                                                <constraint firstAttribute="bottom" secondItem="GTC-NP-gGg" secondAttribute="bottom" constant="8" id="ych-SZ-NeL"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="113" id="8mT-v2-Qx8">
+                                        <rect key="frame" x="0.0" y="641" width="375" height="113"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="8mT-v2-Qx8" id="87S-Cm-kNa">
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="113"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <button hidden="YES" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ceC-iW-RJC">
+                                                    <rect key="frame" x="10" y="30" width="343" height="40"/>
+                                                    <color key="backgroundColor" red="0.98431372549999996" green="0.2784313725" blue="0.2784313725" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="40" id="hsv-E0-CNX"/>
+                                                    </constraints>
+                                                    <state key="normal" title="删   除">
+                                                        <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    </state>
+                                                    <userDefinedRuntimeAttributes>
+                                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                            <real key="value" value="5"/>
+                                                        </userDefinedRuntimeAttribute>
+                                                    </userDefinedRuntimeAttributes>
+                                                    <connections>
+                                                        <action selector="deleteBtnTap:" destination="6hI-Zf-Dol" eventType="touchUpInside" id="Xes-eC-VfF"/>
+                                                        <action selector="tapDeleteBtn:" destination="Vxk-45-vB1" eventType="touchUpInside" id="IFP-6l-1ZD"/>
+                                                    </connections>
+                                                </button>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstAttribute="trailing" secondItem="ceC-iW-RJC" secondAttribute="trailing" constant="16" id="Hrn-eU-isu"/>
+                                                <constraint firstItem="ceC-iW-RJC" firstAttribute="leading" secondItem="87S-Cm-kNa" secondAttribute="leading" constant="16" id="clh-qU-E5h"/>
+                                                <constraint firstItem="ceC-iW-RJC" firstAttribute="centerY" secondItem="87S-Cm-kNa" secondAttribute="centerY" id="eix-O3-ypw"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                </cells>
+                            </tableViewSection>
+                        </sections>
+                        <connections>
+                            <outlet property="dataSource" destination="6hI-Zf-Dol" id="q6S-ea-AMu"/>
+                            <outlet property="delegate" destination="6hI-Zf-Dol" id="ugR-8t-BpE"/>
+                        </connections>
+                    </tableView>
+                    <connections>
+                        <outlet property="calendarColorStackView" destination="sc4-ds-up5" id="M83-qQ-5Dg"/>
+                        <outlet property="calendarDeleteBtn" destination="ceC-iW-RJC" id="hSl-e9-yib"/>
+                        <outlet property="calendarIsOpenBtn" destination="GjW-u2-fg5" id="qt3-Vs-Ni9"/>
+                        <outlet property="calendarIsOpenSwitch" destination="fl8-ZU-9Cp" id="B0z-eA-yDa"/>
+                        <outlet property="calendarManagerField" destination="bIB-vr-JmD" id="vj2-pN-AIk"/>
+                        <outlet property="calendarNameField" destination="E1I-tu-3OF" id="43n-JC-CE2"/>
+                        <outlet property="calendarNewScopeField" destination="HYK-cG-NOj" id="fM2-GR-Qdc"/>
+                        <outlet property="calendarOrgField" destination="vpF-O7-lvf" id="ZMu-T3-6gU"/>
+                        <outlet property="calendarRemarkField" destination="0zU-2p-l4e" id="ia9-f3-lRI"/>
+                        <outlet property="calendarScopeField" destination="5RB-dp-23j" id="NOM-Ib-Knt"/>
+                        <outlet property="calendarStatusSwitch" destination="GTC-NP-gGg" id="AON-0O-FAD"/>
+                        <outlet property="calendarTypeField" destination="6Nq-Qx-KK4" id="ONT-gF-LlR"/>
+                    </connections>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Kl7-oF-Qbs" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1648.8" y="97.601199400299862"/>
+        </scene>
+        <!--编辑内容-->
+        <scene sceneID="d6n-Ns-IYR">
+            <objects>
+                <viewController id="ADR-Nz-B0R" customClass="OOCalendarEditRemarkViewController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="uZ4-K3-7u9">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="x7Q-Xj-laR"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="编辑内容" id="8m9-cj-hJa">
+                        <barButtonItem key="leftBarButtonItem" title="取消" landscapeImage="icon_off_grey" id="Nbx-21-hlf">
+                            <connections>
+                                <action selector="cancel:" destination="ADR-Nz-B0R" id="xBm-rt-txj"/>
+                            </connections>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="保存" id="LXv-Cs-Ybf">
+                            <connections>
+                                <action selector="save:" destination="ADR-Nz-B0R" id="Y1a-tK-EiQ"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="KZu-Ft-RRO" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="3342" y="-716"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="NvP-o5-zSv">
+            <objects>
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="LoN-sU-f4i" customClass="ZLNavigationController" customModule="O2Platform" customModuleProvider="target" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" id="57p-JL-s0t"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Pux-od-ZUE">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="ADR-Nz-B0R" kind="relationship" relationship="rootViewController" id="c9K-2a-rzE"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="irf-LL-qwe" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2622" y="-703"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="check" width="23" height="20"/>
+        <image name="icon_arrow" width="22" height="22"/>
+        <image name="icon_chongfu" width="22" height="22"/>
+        <image name="icon_hdjr" width="22" height="22"/>
+        <image name="icon_off_grey" width="22" height="22"/>
+        <image name="icon_shijian" width="22" height="22"/>
+        <image name="icon_tixing" width="22" height="22"/>
+        <image name="icon_zengjia" width="22" height="22"/>
+    </resources>
 </document>
 </document>

+ 76 - 0
o2ios/O2Platform/App/IM-聊天/IMChatViewController.swift

@@ -53,6 +53,8 @@ class IMChatViewController: UIViewController {
 
 
     // MARK: - properties
     // MARK: - properties
     var conversation: IMConversationInfo? = nil
     var conversation: IMConversationInfo? = nil
+    
+    //private
     private var chatMessageList: [IMMessageInfo] = []
     private var chatMessageList: [IMMessageInfo] = []
     private var page = 1
     private var page = 1
     private var isShowEmoji = false
     private var isShowEmoji = false
@@ -95,6 +97,12 @@ class IMChatViewController: UIViewController {
         } else {
         } else {
             self.title = self.conversation?.title
             self.title = self.conversation?.title
         }
         }
+        //群会话 添加修改标题的按钮
+        if self.conversation?.type == o2_im_conversation_type_group &&
+            O2AuthSDK.shared.myInfo()?.distinguishedName == self.conversation?.adminPerson {
+            navigationItem.rightBarButtonItem = UIBarButtonItem(title: "修改", style: .plain, target: self, action: #selector(clickUpdate))
+        }
+        
         //获取聊天数据
         //获取聊天数据
         self.loadMsgList(page: page)
         self.loadMsgList(page: page)
         //阅读
         //阅读
@@ -119,6 +127,74 @@ class IMChatViewController: UIViewController {
             }
             }
         }
         }
     }
     }
+    
+    @objc private func clickUpdate() {
+        self.showSheetAction(title: "", message: "选择要修改的项", actions: [
+            UIAlertAction(title: "修改群名", style: .default, handler: { (action) in
+                self.updateTitle()
+            }),
+            UIAlertAction(title: "修改成员", style: .default, handler: { (action) in
+                self.updatePeople()
+            })
+        ])
+    }
+    
+    private func updateTitle() {
+        self.showPromptAlert(title: "", message: "修改群名", inputText: "") { (action, result) in
+            if result.isEmpty {
+                self.showError(title: "请输入群名")
+            }else {
+                self.showLoading()
+                self.viewModel.updateConversationTitle(id: (self.conversation?.id!)!, title: result)
+                    .then { (c) in
+                        self.title = result
+                        self.conversation?.title = result
+                        self.showSuccess(title: "修改成功")
+                }.catch { (err) in
+                    DDLogError(err.localizedDescription)
+                    self.showError(title: "修改失败")
+                }
+            }
+        }
+    }
+    
+    private func updatePeople() {
+        //选择人员 反选已经存在的成员
+        if let users = self.conversation?.personList  {
+            self.showContactPicker(modes: [.person], callback: { (result) in
+                if let people = result.users  {
+                    if people.count >= 3 {
+                        var peopleDNs: [String] = []
+                        var containMe = false
+                        people.forEach { (item) in
+                            peopleDNs.append(item.distinguishedName!)
+                            if O2AuthSDK.shared.myInfo()?.distinguishedName == item.distinguishedName {
+                                containMe = true
+                            }
+                        }
+                        if !containMe {
+                            peopleDNs.append((O2AuthSDK.shared.myInfo()?.distinguishedName)!)
+                        }
+                        self.showLoading()
+                        self.viewModel.updateConversationPeople(id: (self.conversation?.id!)!, users: peopleDNs)
+                            .then { (c)  in
+                                self.conversation?.personList = peopleDNs
+                                self.showSuccess(title: "修改成功")
+                        }.catch { (err) in
+                            DDLogError(err.localizedDescription)
+                            self.showError(title: "修改失败")
+                        }
+                    }else {
+                        self.showError(title: "选择人数不足3人")
+                    }
+                }else {
+                    self.showError(title: "请选择人员")
+                }
+            }, initUserPickedArray: users)
+        }else {
+            self.showError(title: "成员列表数据错误!")
+        }
+    }
 
 
     //获取消息
     //获取消息
     private func loadMsgList(page: Int) {
     private func loadMsgList(page: Int) {

+ 35 - 0
o2ios/O2Platform/App/IM-聊天/IMViewModel.swift

@@ -42,6 +42,41 @@ extension IMViewModel {
         
         
     }
     }
     
     
+    //修改标题
+    func updateConversationTitle(id: String, title: String) -> Promise<IMConversationInfo> {
+        return Promise { fulfill, reject in
+            self.communicateAPI.request(.updateConversationTitle(id, title), completion: { result in
+                let response = OOResult<BaseModelClass<IMConversationInfo>>(result)
+                if response.isResultSuccess() {
+                    if let info = response.model?.data {
+                        fulfill(info)
+                    } else {
+                        reject(OOAppError.apiEmptyResultError)
+                    }
+                } else {
+                    reject(response.error!)
+                }
+            })
+        }
+    }
+    //修改成员列表
+    func updateConversationPeople(id: String, users: [String]) -> Promise<IMConversationInfo> {
+        return Promise { fulfill, reject in
+            self.communicateAPI.request(.updateConversationPeople(id, users), completion: { result in
+                let response = OOResult<BaseModelClass<IMConversationInfo>>(result)
+                if response.isResultSuccess() {
+                    if let info = response.model?.data {
+                        fulfill(info)
+                    } else {
+                        reject(OOAppError.apiEmptyResultError)
+                    }
+                } else {
+                    reject(response.error!)
+                }
+            })
+        }
+    }
+    
     //阅读会话
     //阅读会话
     func readConversation(conversationId: String?) {
     func readConversation(conversationId: String?) {
         guard let id = conversationId else {
         guard let id = conversationId else {

+ 14 - 0
o2ios/O2Platform/App/IM-聊天/Model/IMConversationInfo.swift

@@ -31,6 +31,20 @@ class IMConversationInfo: NSObject, DataModel {
     }
     }
 }
 }
 
 
+class IMConversationUpdateForm: NSObject, DataModel  {
+    @objc var id: String?
+    @objc var title: String?
+    @objc var personList: [String]?
+    @objc var adminPerson: String?
+    @objc var note: String?
+    
+    required override init() { }
+
+       func mapping(mapper: HelpingMapper) {
+
+       }
+}
+
 
 
 class IMMessageRequestForm: NSObject, DataModel {
 class IMMessageRequestForm: NSObject, DataModel {
 
 

+ 7 - 2
o2ios/O2Platform/App/meeting-会议/Controller/OOMeetingCreateViewController.swift

@@ -43,13 +43,18 @@ class OOMeetingCreateViewController: UIViewController {
     }
     }
     
     
     @objc func createMeetingAction(_ sender:Any){
     @objc func createMeetingAction(_ sender:Any){
-        let mForm = ooFormView.getFormDataFormBean()
+        let mBack = ooFormView.getFormDataFormBean()
+        guard let mForm = mBack.0 else {
+            self.showError(title: mBack.1 ?? "表单填写错误")
+            return
+        }
+        
         self.viewModel.selectedPersons.forEach { (p) in
         self.viewModel.selectedPersons.forEach { (p) in
             mForm.invitePersonList.append(p.distinguishedName!)
             mForm.invitePersonList.append(p.distinguishedName!)
         }
         }
         let mBean = OOMeetingFormBean(meetingForm: mForm)
         let mBean = OOMeetingFormBean(meetingForm: mForm)
         if mBean.checkFormValues() {
         if mBean.checkFormValues() {
-            let jsno = mBean.toJSONString() ?? "default "
+            let jsno = mBean.toJSONString() ?? "{}"
             DDLogDebug(jsno)
             DDLogDebug(jsno)
             viewModel.createMeetingAction(mBean, completedBlock: { (resultMessage) in
             viewModel.createMeetingAction(mBean, completedBlock: { (resultMessage) in
                 if let message = resultMessage {
                 if let message = resultMessage {

+ 27 - 9
o2ios/O2Platform/App/meeting-会议/View/meeting/OOMeetingCreateFormView.swift

@@ -106,22 +106,40 @@ class OOMeetingCreateFormView: UIView {
     }
     }
     
     
     
     
-    func getFormDataFormBean() -> OOMeetingForm {
+    func getFormDataFormBean() -> (OOMeetingForm?, err: String?) {
         let meetingForm = OOMeetingForm()
         let meetingForm = OOMeetingForm()
         //标题
         //标题
-        meetingForm.subject = textItemView.model?.callbackValue  as? String
+        guard let title = textItemView.model?.callbackValue  as? String else {
+            return (nil, "请输入会议主题")
+        }
+        meetingForm.subject = title
         //日期
         //日期
-        meetingForm.meetingDate = dateItemView.model?.callbackValue as! Date
+        guard let date = dateItemView.model?.callbackValue as? Date else {
+            return (nil, "请选择日期")
+        }
+        meetingForm.meetingDate = date
+        
         //开始时间
         //开始时间
         let model = dateIntervalItemView.model as! OOFormDateIntervalModel
         let model = dateIntervalItemView.model as! OOFormDateIntervalModel
-        meetingForm.startTime = model.value1 as! Date
+        guard let startTime = model.value1 as? Date else {
+            return (nil, "请选择开始时间")
+        }
+        meetingForm.startTime = startTime
         //结束时间
         //结束时间
-        meetingForm.completedTime = model.value2 as! Date
+        guard let endTime = model.value2 as? Date else {
+            return (nil, "请选择结束时间")
+        }
+        meetingForm.completedTime = endTime
         //会议室
         //会议室
-        let room = segueItemView.model?.callbackValue as? OOMeetingRoomInfo
-        meetingForm.room = room?.id
-        meetingForm.roomName = room?.name
-        return meetingForm
+        
+        guard let room = segueItemView.model?.callbackValue as? OOMeetingRoomInfo else {
+            return (nil, "请选择会议室")
+        }
+        meetingForm.room = room.id
+        meetingForm.roomName = room.name
+        return (meetingForm, nil)
     }
     }
+    
+     
 
 
 }
 }

+ 15 - 1
o2ios/O2Platform/Framework/O2API/Communicate/CommunicateAPI.swift

@@ -18,6 +18,8 @@ enum CommunicateAPI {
     case readConversation(String)
     case readConversation(String)
     case instantMessageList(Int)
     case instantMessageList(Int)
     case createConversation(IMConversationInfo)
     case createConversation(IMConversationInfo)
+    case updateConversationTitle(String, String)
+    case updateConversationPeople(String, [String])
     case imUploadFile(String, String, String, Data)
     case imUploadFile(String, String, String, Data)
     case imDownloadFullFile(String, String)
     case imDownloadFullFile(String, String)
     
     
@@ -59,6 +61,8 @@ extension CommunicateAPI: TargetType {
             return "/jaxrs/instant/list/currentperson/noim/count/\(count)/desc"
             return "/jaxrs/instant/list/currentperson/noim/count/\(count)/desc"
         case .createConversation(_):
         case .createConversation(_):
             return "/jaxrs/im/conversation"
             return "/jaxrs/im/conversation"
+        case .updateConversationTitle(_, _), .updateConversationPeople(_, _):
+            return "/jaxrs/im/conversation"
         case .imUploadFile(let conversationId, let type, _, _):
         case .imUploadFile(let conversationId, let type, _, _):
             return "/jaxrs/im/msg/upload/\(conversationId)/type/\(type)"
             return "/jaxrs/im/msg/upload/\(conversationId)/type/\(type)"
         case .imDownloadFullFile(let id, _):
         case .imDownloadFullFile(let id, _):
@@ -72,7 +76,7 @@ extension CommunicateAPI: TargetType {
             return .get
             return .get
         case .msgListByPaging(_, _, _), .sendMsg(_), .createConversation(_), .imUploadFile(_, _, _, _):
         case .msgListByPaging(_, _, _), .sendMsg(_), .createConversation(_), .imUploadFile(_, _, _, _):
             return .post
             return .post
-        case .readConversation(_):
+        case .readConversation(_), .updateConversationPeople(_, _), .updateConversationTitle(_, _):
             return .put
             return .put
         }
         }
     }
     }
@@ -93,6 +97,16 @@ extension CommunicateAPI: TargetType {
             return .requestParameters(parameters: msg.toJSON()!, encoding: JSONEncoding.default)
             return .requestParameters(parameters: msg.toJSON()!, encoding: JSONEncoding.default)
         case .createConversation(let conv):
         case .createConversation(let conv):
             return .requestParameters(parameters: conv.toJSON()!, encoding: JSONEncoding.default)
             return .requestParameters(parameters: conv.toJSON()!, encoding: JSONEncoding.default)
+        case .updateConversationTitle(let id, let title):
+            let form = IMConversationUpdateForm()
+            form.id = id
+            form.title = title
+            return .requestParameters(parameters: form.toJSON()!, encoding: JSONEncoding.default)
+        case .updateConversationPeople(let id, let people):
+            let form = IMConversationUpdateForm()
+            form.id = id
+            form.personList = people
+            return .requestParameters(parameters: form.toJSON()!, encoding: JSONEncoding.default)
         case .imUploadFile(_, _, let fileName, let data):
         case .imUploadFile(_, _, let fileName, let data):
             //字符串类型 文件名
             //字符串类型 文件名
             let strData = fileName.data(using: .utf8)
             let strData = fileName.data(using: .utf8)

+ 2 - 2
o2ios/O2Platform/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.1</string>
+	<string>5.1.2</string>
 	<key>CFBundleURLTypes</key>
 	<key>CFBundleURLTypes</key>
 	<array>
 	<array>
 		<dict>
 		<dict>
@@ -32,7 +32,7 @@
 		</dict>
 		</dict>
 	</array>
 	</array>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>
-	<string>71</string>
+	<string>72</string>
 	<key>LSRequiresIPhoneOS</key>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<true/>
 	<key>NSAppTransportSecurity</key>
 	<key>NSAppTransportSecurity</key>

+ 167 - 0
o2ios/O2Platform/UI/stringsPicker/O2StringPicker.swift

@@ -0,0 +1,167 @@
+//
+//  O2StringPicker.swift
+//  O2Platform
+//
+//  Created by FancyLou on 2020/6/30.
+//  Copyright © 2020 zoneland. All rights reserved.
+//
+
+import UIKit
+
+class O2StringPicker: UIView, NibLoadable {
+    @IBOutlet weak var titleLabel: UILabel!
+    @IBOutlet weak var pickerView: UIPickerView!
+    @IBOutlet weak var mainViewBottomLayout: NSLayoutConstraint!
+    @IBOutlet weak var mainView: UIView!
+    
+    @IBAction func cancelBtnAction(_ sender: UIButton) {
+        self.dismiss()
+    }
+    
+    @IBAction func okBtnAction(_ sender: UIButton) {
+        completionHandler(self.selectItemValue ?? "")
+        dismiss()
+    }
+    
+    private var completionHandler: (_ result: String) -> Void = {_ in }
+    
+    private var itemArray: [String] = []
+    private var valueArray: [String] = []
+    
+    private var selectItemValue: String? = nil
+    
+    class func instance(items: [String],completionHandler: @escaping (_ result: String) -> Void,  values:[String]? = nil, pickerTitle:String? = nil, currentValue: String? = nil) -> O2StringPicker{
+        
+        let view: O2StringPicker = O2StringPicker.loadViewFromNib()
+        
+        view.completionHandler = completionHandler
+        
+        view.itemArray = items
+        if let v = values, v.count > 0 {
+            view.valueArray = v
+        }
+        
+        view.selectItemValue = currentValue
+        
+        view.titleLabel.text = pickerTitle ?? ""
+        
+        view.setupUI()
+        
+        return view
+    }
+    
+    private func setupUI() {
+
+        self.mainViewBottomLayout.constant = 320
+        
+        self.backgroundColor  = UIColor.hexRGB(0x000000, 0.0)
+        
+        let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
+        tap.delegate = self
+        addGestureRecognizer(tap)
+        
+        pickerView.delegate = self
+        pickerView.dataSource = self
+    }
+    
+    func show() {
+        UIApplication.shared.keyWindow!.addSubview(self)
+        
+        self.frame = UIScreen.main.bounds
+        
+        UIView.animate(withDuration: 0.3, animations: {
+            
+            self.mainViewBottomLayout.constant = 0
+            
+            self.backgroundColor = UIColor.hexRGB(0x000000, 0.5)
+            
+            self.layoutIfNeeded()
+        }, completion: { (finish) in
+            //选中
+            var row = 0
+            if let item = self.selectItemValue {
+                if self.valueArray.count > 0 {
+                    self.valueArray.forEachEnumerated { (index, value) in
+                        if item == value {
+                            row = index
+                        }
+                    }
+                }else {
+                    self.itemArray.forEachEnumerated { (index, value) in
+                        if item == value {
+                            row = index
+                        }
+                    }
+                }
+            }
+            self.pickerView.selectRow(row, inComponent: 0, animated: true)
+        })
+    }
+    
+    @objc func dismiss() {
+        UIView.animate(withDuration: 0.3, animations: {
+            
+            self.mainViewBottomLayout.constant = 320
+            
+            self.backgroundColor = UIColor.hexRGB(0x000000, 0.0)
+            
+            self.layoutIfNeeded()
+            
+        }, completion: { (finished) in
+            
+            self.removeFromSuperview()
+            
+        })
+    }
+    
+    
+}
+
+extension O2StringPicker: UIPickerViewDelegate, UIPickerViewDataSource {
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
+        //仅支持一组 多组联动未实现
+        return 1
+    }
+    
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+        return self.itemArray.count
+    }
+    
+    func pickerView(_ pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat {
+        return 40
+    }
+    
+    func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
+        let title = self.itemArray[row]
+        if let label = view as? UILabel {
+            label.text = title
+            return label
+        }
+        
+        let label = UILabel()
+        label.textAlignment = .center
+        label.font = UIFont.systemFont(ofSize: 17)
+        label.text = title
+        label.sizeToFit()
+        return label
+    }
+    
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+        self.selectItemValue = self.valueArray[row]
+    }
+    
+}
+
+extension O2StringPicker: UIGestureRecognizerDelegate {
+    
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        guard let touchView = touch.view else { return false }
+        
+        if touchView.isDescendant(of: mainView) {
+            // 点击的view是否是mainView或者mainView的子视图
+            return false
+        }
+        
+        return true
+    }
+}

+ 103 - 0
o2ios/O2Platform/UI/stringsPicker/O2StringPicker.xib

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="O2StringPicker" customModule="O2Platform" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3A7-rs-0AU" userLabel="MainView">
+                    <rect key="frame" x="0.0" y="912" width="414" height="270"/>
+                    <subviews>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kaq-8v-Ylc">
+                            <rect key="frame" x="24" y="8" width="48" height="48"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="48" id="pu5-wT-fTf"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <state key="normal" title="取消">
+                                <color key="titleColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
+                            </state>
+                            <connections>
+                                <action selector="cancelBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="HY3-ik-FeV"/>
+                            </connections>
+                        </button>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rXb-xN-l1U">
+                            <rect key="frame" x="96" y="8" width="222" height="48"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FNp-a0-dWc" userLabel="SplitView">
+                            <rect key="frame" x="0.0" y="64" width="414" height="1"/>
+                            <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="SFj-0T-7ul"/>
+                            </constraints>
+                        </view>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vfI-v2-Lba">
+                            <rect key="frame" x="342" y="8" width="48" height="48"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="48" id="c1l-S5-QYd"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <state key="normal" title="确定">
+                                <color key="titleColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
+                            </state>
+                            <connections>
+                                <action selector="okBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="fPe-wf-ocR"/>
+                            </connections>
+                        </button>
+                        <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TN6-BB-tsr">
+                            <rect key="frame" x="0.0" y="65" width="414" height="205"/>
+                        </pickerView>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="TN6-BB-tsr" secondAttribute="trailing" id="5tN-Oi-BJo"/>
+                        <constraint firstItem="vfI-v2-Lba" firstAttribute="top" secondItem="3A7-rs-0AU" secondAttribute="top" constant="8" id="7Ey-CR-C5c"/>
+                        <constraint firstItem="vfI-v2-Lba" firstAttribute="leading" secondItem="rXb-xN-l1U" secondAttribute="trailing" constant="24" id="AFG-Lp-sND"/>
+                        <constraint firstItem="FNp-a0-dWc" firstAttribute="top" secondItem="3A7-rs-0AU" secondAttribute="top" constant="64" id="FIk-CB-7Ys"/>
+                        <constraint firstItem="FNp-a0-dWc" firstAttribute="top" secondItem="Kaq-8v-Ylc" secondAttribute="bottom" constant="8" id="G5k-l9-2Yi"/>
+                        <constraint firstAttribute="height" constant="270" id="NiP-Tw-Lsy"/>
+                        <constraint firstAttribute="bottom" secondItem="TN6-BB-tsr" secondAttribute="bottom" id="PBa-G0-kd2"/>
+                        <constraint firstItem="FNp-a0-dWc" firstAttribute="top" secondItem="vfI-v2-Lba" secondAttribute="bottom" constant="8" id="QLq-Mz-ZAG"/>
+                        <constraint firstItem="rXb-xN-l1U" firstAttribute="top" secondItem="3A7-rs-0AU" secondAttribute="top" constant="8" id="TYI-UU-uWx"/>
+                        <constraint firstAttribute="trailing" secondItem="FNp-a0-dWc" secondAttribute="trailing" id="YDG-f5-Zw6"/>
+                        <constraint firstItem="Kaq-8v-Ylc" firstAttribute="leading" secondItem="3A7-rs-0AU" secondAttribute="leading" constant="24" id="aH6-YP-1aH"/>
+                        <constraint firstItem="Kaq-8v-Ylc" firstAttribute="top" secondItem="3A7-rs-0AU" secondAttribute="top" constant="8" id="aV4-b3-HJO"/>
+                        <constraint firstAttribute="trailing" secondItem="vfI-v2-Lba" secondAttribute="trailing" constant="24" id="de7-PG-NlB"/>
+                        <constraint firstItem="FNp-a0-dWc" firstAttribute="top" secondItem="rXb-xN-l1U" secondAttribute="bottom" constant="8" id="fcW-vg-Ri6"/>
+                        <constraint firstItem="TN6-BB-tsr" firstAttribute="leading" secondItem="3A7-rs-0AU" secondAttribute="leading" id="gkV-uQ-5xn"/>
+                        <constraint firstItem="FNp-a0-dWc" firstAttribute="leading" secondItem="3A7-rs-0AU" secondAttribute="leading" id="go6-MS-8Q1"/>
+                        <constraint firstItem="rXb-xN-l1U" firstAttribute="leading" secondItem="Kaq-8v-Ylc" secondAttribute="trailing" constant="24" id="mRV-jM-IRH"/>
+                        <constraint firstItem="TN6-BB-tsr" firstAttribute="top" secondItem="FNp-a0-dWc" secondAttribute="bottom" id="o2z-yS-SIc"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.40164811643835618" colorSpace="custom" customColorSpace="displayP3"/>
+            <constraints>
+                <constraint firstItem="3A7-rs-0AU" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="C9J-Ep-twg"/>
+                <constraint firstAttribute="trailing" secondItem="3A7-rs-0AU" secondAttribute="trailing" id="Wcp-GX-rAZ"/>
+                <constraint firstItem="3A7-rs-0AU" firstAttribute="bottom" secondItem="vUN-kp-3ea" secondAttribute="bottom" constant="320" id="pOe-Sv-tko"/>
+            </constraints>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
+            <connections>
+                <outlet property="mainView" destination="3A7-rs-0AU" id="2c0-FU-vly"/>
+                <outlet property="mainViewBottomLayout" destination="pOe-Sv-tko" id="j2d-2I-Off"/>
+                <outlet property="pickerView" destination="TN6-BB-tsr" id="xyq-dD-Rx0"/>
+                <outlet property="titleLabel" destination="rXb-xN-l1U" id="Fz8-Fp-X3Z"/>
+            </connections>
+            <point key="canvasLocation" x="131.8840579710145" y="152.67857142857142"/>
+        </view>
+    </objects>
+</document>