提交工作返回对象变更

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

@@ -164,12 +164,6 @@ class OOCalendarViewController: UITableViewController {
             return
         }
         self.showLoading(title: "正在保存...")
-        /*
-      var calendar = self.calendarInfo
-      if calendarInfo != nil && calendarInfo?.id != nil { // 修改
-          //calendar.id = calendarInfo?.id!
-          calendar = calendarInfo ?? OOCalendarInfo.init()
-      }*/
 
         self.calendarInfo!.name = name
         self.calendarInfo!.isPublic = isopen
@@ -191,11 +185,11 @@ class OOCalendarViewController: UITableViewController {
         }
 
         viewModel.saveCalendar(calendar: self.calendarInfo!)
-            .then { (result) in
+            .always {
+                self.hideLoading()
+            }.then { (result) in
                 DDLogInfo("保存日历成功！！！\(result)")
                 self.closeWindow()
-            }.always {
-                self.hideLoading()
             }.catch { (error) in
                 DDLogError(error.localizedDescription)
                 self.showError(title: "保存日历错误！")

o2ios/O2Platform/App/VoiceAI-语音处理/ViewModel/OOAIViewModel.swift

@@ -229,7 +229,7 @@ extension OOAIViewModel {
         let param:[String:String] = ["routeName":routeName, "opinion":""]
         let task = self.taskList[self.currentDealTaskIndex]
         self.taskAPI.request(.taskSaveAndSubmit(task.id!, (param as Dictionary<String, AnyObject>)), completion: { result in
-            let response = OOResult<BaseModelClass<[O2TodoTaskNeural]>>(result)
+            let response = OOResult<BaseModelClass<O2WorkPostResult>>(result)
             if response.isResultSuccess() {
                 self.currentDealTaskIndex = self.currentDealTaskIndex + 1
                 self.speakMessage = "工作处理完成！"

o2ios/O2Platform/App/Work-工作/m/OOTaskModels.swift

@@ -57,21 +57,44 @@ class O2TodoTask:NSObject,DataModel {
 }
 
 class  O2TodoTaskNeural:NSObject,DataModel {
-    var routeName: String?
+    @objc var routeName: String?
     //var workLogList
     required override init() {
         
     }
 }
 
+class O2WorkPostResult:NSObject,DataModel {
+    required override init() {
+           
+       }
+    
+    @objc var id: String?
+    @objc var application: String?
+    @objc var process: String?
+    @objc var job: String?
+    @objc var work: String?
+    var completed: Bool?
+    @objc var fromActivity: String?
+    @objc var fromActivityType: String?
+    @objc var fromActivityName: String?
+    @objc var fromActivityAlias: String?
+    @objc var fromActivityToken: String?
+    @objc var recordTime: String?
+    @objc var person: String?
+    @objc var identity: String?
+    @objc var unit: String?
+    @objc var type: String?
+}
+
 class O2AppProcess: NSObject,DataModel {
-    var id:String?
-    var name:String?
-    var alias:String?
-    var desc:String?
-    var creatorPerson:String?
-    var application:String?
-    var icon:String?
+    @objc var id:String?
+    @objc var name:String?
+    @objc var alias:String?
+    @objc var desc:String?
+    @objc var creatorPerson:String?
+    @objc var application:String?
+    @objc var icon:String?
     
     func mapping(mapper: HelpingMapper) {
         mapper <<<

o2ios/O2Platform/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.6</string>
+	<string>5.1.7</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>76</string>
+	<string>77</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>