Skip to content

o2oa
o2oa

此号慢热型 / o2oa
与 Fork 源项目一致

Fork自 浙江兰德纵横网络技术股份有限公司 / o2oa

通知 5
Star 0
Fork 0
o2oa
o2oa

体验新版 GitCode，发现更多精彩内容 >>

提交 681cafca 编写于 作者: 楼 楼国栋
浏览文件
操作

Merge branch 'fix/ios_workcompleted_open_bug' into 'develop' 

IOS打开结束工作错误的bug

See merge request o2oa/o2oa!1273
上级 6ccee5cb a7a44ba5
隐藏空白更改
内联 并排
Showing with 374 addition and 374 deletion
o2ios/O2Platform/App/Work-工作/c/TodoTaskDetailViewController.swift
浏览文件 @ 681cafca
......@@ -30,57 +30,57 @@ struct TodoTaskJS {
static let CHECK_FORM = "layout.appForm.formValidation(null, null)"
static let CLOSE_WORK = "layout.app.appForm.finishOnMobile()"
static func getDataWithJS(_ webView:UIWebView,jscode:String) -> [String:AnyObject] {
static func getDataWithJS(_ webView: UIWebView, jscode: String) -> [String: AnyObject] {
let str = webView.stringByEvaluatingJavaScript(from: jscode)
//let data = str?.dataUsingEncoding(NSUTF8StringEncoding)
let json = JSON.init(parseJSON: str!)
return json.dictionaryObject! as [String : AnyObject]
return json.dictionaryObject! as [String: AnyObject]
}
}
class TodoTaskDetailViewController: BaseWebViewUIViewController {
@IBOutlet weak var progress: UIProgressView!
@IBOutlet weak var webViewContainer: UIView!
var qlController = TaskAttachmentPreviewController()
//是否是已办
open var isWorkCompeleted:Bool = false
open var workId:String?
open var isWorkCompeleted: Bool = false
open var workId: String?
var toolbarView: UIToolbar!
var taskProcess = TaskProcess()
let group = DispatchGroup()
/// backFlag = 1来自MainTask,backFlag = 2来自TodoTask 3是show dis
var backFlag:Int = 0
var loadUrl:String?
var isJSExecuted:Bool = true
var hasToolbar:Bool = false
var backFlag: Int = 0
var loadUrl: String?
var isJSExecuted: Bool = true
var hasToolbar: Bool = false
//任务模式
var todoTask:TodoTask? {
var todoTask: TodoTask? {
didSet {
var url:String?
if let workId = todoTask?.work, workId != "" {
url = AppDelegate.o2Collect.genrateURLWithWebContextKey(DesktopContext.DesktopContextKey, query: DesktopContext.todoDesktopQuery, parameter: ["##workid##":workId as AnyObject])
self.isWorkCompeleted = false
self.workId = workId
}else if let workCompletedId = todoTask?.workCompleted, workCompletedId != "" {
url = AppDelegate.o2Collect.genrateURLWithWebContextKey(DesktopContext.DesktopContextKey, query: DesktopContext.todoedDestopQuery, parameter: ["##workCompletedId##":workCompletedId as AnyObject])
var url: String?
if let workCompletedId = todoTask?.workCompleted, workCompletedId != "" {
url = AppDelegate.o2Collect.genrateURLWithWebContextKey(DesktopContext.DesktopContextKey, query: DesktopContext.todoedDestopQuery, parameter: ["##workCompletedId##": workCompletedId as AnyObject])
self.isWorkCompeleted = true
self.workId = workCompletedId
} else if let workId = todoTask?.work, workId != "" {
url = AppDelegate.o2Collect.genrateURLWithWebContextKey(DesktopContext.DesktopContextKey, query: DesktopContext.todoDesktopQuery, parameter: ["##workid##": workId as AnyObject])
self.isWorkCompeleted = false
self.workId = workId
}
self.loadUrl = url
}
......@@ -89,19 +89,19 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
var draft: ProcessDraftBean? {
didSet {
if let json = draft?.toJSONString() {
self.loadUrl = AppDelegate.o2Collect.genrateURLWithWebContextKey(DesktopContext.DesktopContextKey, query: DesktopContext.todoDraftQuery, parameter: ["##draft##":json as AnyObject])
self.loadUrl = AppDelegate.o2Collect.genrateURLWithWebContextKey(DesktopContext.DesktopContextKey, query: DesktopContext.todoDraftQuery, parameter: ["##draft##": json as AnyObject])
}
}
}
var myTask: [String : AnyObject]?
var myRead: [String : AnyObject]?
var myControl: [String : AnyObject]?
var myTask: [String: AnyObject]?
var myRead: [String: AnyObject]?
var myControl: [String: AnyObject]?
var myNewControls: [WorkNewActionItem] = []
var moreActionMenus: O2WorkMoreActionSheet? = nil
var myTitle: String?
override func viewDidLoad() {
super.viewDidLoad()
// 返回按钮重新定义
......@@ -111,19 +111,19 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
// 文档查看器
self.qlController.dataSource = qlController
self.qlController.delegate = qlController
//toolbar
self.toolbarView = UIToolbar(frame: CGRect(x: 0, y: self.view.height - 44, width: self.view.width, height: 44))
myTitle = todoTask?.title
if myTitle?.isBlank == false {
if myTitle?.isBlank == false {
title = myTitle
}else if todoTask?.processName?.isBlank == false {
} else if todoTask?.processName?.isBlank == false {
title = todoTask?.processName
}
//添加工作页面特殊的js处理
addScriptMessageHandler(key: "closeWork", handler: self)
addScriptMessageHandler(key: "appFormLoaded", handler: self)
......@@ -132,51 +132,51 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
addScriptMessageHandler(key: "replaceAttachment", handler: self)
addScriptMessageHandler(key: "openDocument", handler: self)
self.theWebView()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
//监控进度
webView.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
if #available(iOS 13.0, *) {
DispatchQueue.main.async {
self.navigationController?.navigationBar.setNeedsLayout()
}
}
if #available(iOS 13.0, *) {
DispatchQueue.main.async {
self.navigationController?.navigationBar.setNeedsLayout()
}
}
}
override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated)
webView.removeObserver(self, forKeyPath: "estimatedProgress")
}
override func theWebView(){
override func theWebView() {
super.theWebView()
self.webViewContainer.addSubview(self.webView)
self.webView.translatesAutoresizingMaskIntoConstraints = false
let top = NSLayoutConstraint(item: self.webView!, attribute: NSLayoutConstraint.Attribute.top, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.webViewContainer, attribute: NSLayoutConstraint.Attribute.top, multiplier: 1, constant: 0)
let bottom = NSLayoutConstraint(item: self.webView!, attribute: NSLayoutConstraint.Attribute.bottom, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.webViewContainer, attribute: NSLayoutConstraint.Attribute.bottom, multiplier: 1, constant: 0)
let trailing = NSLayoutConstraint(item: self.webView!, attribute: NSLayoutConstraint.Attribute.trailing, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.webViewContainer, attribute: NSLayoutConstraint.Attribute.trailing, multiplier: 1, constant: 0)
let leading = NSLayoutConstraint(item: self.webView!, attribute: NSLayoutConstraint.Attribute.leading, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.webViewContainer, attribute: NSLayoutConstraint.Attribute.leading, multiplier: 1, constant: 0)
self.webViewContainer.addConstraints([top, bottom, trailing, leading])
webView.navigationDelegate = self
webView.uiDelegate = self
DDLogDebug("url:\(String(describing: loadUrl))")
if let url = loadUrl {
webView.load(Alamofire.request(url).request!)
}else {
} else {
webView.loadHTMLString("<h2>没有获取到正确的URL！</h2>", baseURL: nil)
}
webView.allowsBackForwardNavigationGestures = true
}
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey: Any]?, context: UnsafeMutableRawPointer?) {
if keyPath == "estimatedProgress" {
progress.isHidden = webView.estimatedProgress == 1
progress.setProgress(Float(webView.estimatedProgress), animated: true)
......@@ -188,29 +188,29 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if segue.identifier == "showTodoProcessSegue" {
let destVC = segue.destination as! TodoTaskProcessViewController
let destVC = segue.destination as! TodoTaskProcessViewController
//传递到下一步
destVC.backFlag = backFlag
destVC.taskProcess = self.taskProcess
}
}
/**
提交后返回此处，在此执行是返回首页还是待办处理页
- parameter segue:
*/
@IBAction func processBackMe(_ segue:UIStoryboardSegue){
@IBAction func processBackMe(_ segue: UIStoryboardSegue) {
goBack()
}
//MARK: - private func
@objc func closeForBackBtn() {
DDLogDebug("点击关闭按钮了。。。。。。。。。")
//调用 js的 关闭当前工作的 函数 js会做新建检查工作
......@@ -222,7 +222,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
})
}
@objc func goBack() {
DDLogDebug("backFlag = \(backFlag)")
switch backFlag {
......@@ -238,27 +238,27 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
DDLogDebug("返回两层。。。。。")
if let secVC = self.navigationController?.viewControllers.get(at: index - 2) {
self.navigationController?.popToViewController(secVC, animated: true)
}else {
} else {
DDLogError("返回两层 错误 没有获取到VC。。。。。")
self.navigationController?.popViewController(animated: true)
}
}else {
} else {
DDLogError("返回两层 错误 当前index。。。。。")
self.navigationController?.popViewController(animated: true)
}
break
break
default: // 3,4都用隐藏 除非删除 删除结束有特殊处理了。
self.navigationController?.popViewController(animated: true)
break
}
}
@objc func itemBtnDocDeleteAction() {
DDLogDebug("btnDeleteDoc Click")
showDefaultConfirm(title: "提示", message: "确认要删除这个文档吗，删除后无法恢复？", okHandler: { (action) in
self.showLoading(title: "删除中...")
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskDataContextKey, query: TaskContext.taskWorkDeleteQuery, parameter: ["##id##":self.workId! as AnyObject])
Alamofire.request(url!,method:.delete, parameters: nil, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskDataContextKey, query: TaskContext.taskWorkDeleteQuery, parameter: ["##id##": self.workId! as AnyObject])
Alamofire.request(url!, method: .delete, parameters: nil, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
switch response.result {
case .success(let val):
//DDLogDebug(val)
......@@ -266,13 +266,13 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
if json["type"] == "success" {
self.showSuccess(title: "删除成功")
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.3, execute: {
// 删除之后没有这个工作了，所以直接返回列表 防止返回到已办的TodoedTaskViewController
if self.backFlag == 4 {
self.backFlag = 2
}
self.goBack()
})
}else{
// 删除之后没有这个工作了，所以直接返回列表 防止返回到已办的TodoedTaskViewController
if self.backFlag == 4 {
self.backFlag = 2
}
self.goBack()
})
} else {
DDLogError(json.description)
self.showError(title: "删除失败")
}
......@@ -282,24 +282,24 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
}
})
}
@objc func itemBtnDocSaveAction() {
DDLogDebug("btnSaveDoc Click")
self.showLoading(title: "保存中...")
self.setupData()
group.notify(queue: DispatchQueue.main) {
if self.isJSExecuted {
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskDataContextKey, query: TaskContext.taskDataSaveQuery, parameter: ["##id##":self.taskProcess.workId! as AnyObject])
Alamofire.request(url!,method:.put, parameters: self.taskProcess.businessDataDict!, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskDataContextKey, query: TaskContext.taskDataSaveQuery, parameter: ["##id##": self.taskProcess.workId! as AnyObject])
Alamofire.request(url!, method: .put, parameters: self.taskProcess.businessDataDict!, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
switch response.result {
case .success(let val):
//DDLogDebug(val)
let json = JSON(val)
if json["type"] == "success" {
self.showSuccess(title: "保存成功")
}else{
} else {
DDLogError(json.description)
self.showError(title: "保存失败")
}
......@@ -308,53 +308,53 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
self.showError(title: "保存失败")
}
}
}else{
} else {
self.showError(title: "保存失败")
}
}
}
//提供给TodoTaskProcessViewController使用的 提交之前也要验证一次表单，根据传入的路由和意见来判断表单
@objc func checkFormBeforeProcessSubmit(routeName:String, opinion:String, callback: @escaping (Bool) -> Void) {
@objc func checkFormBeforeProcessSubmit(routeName: String, opinion: String, callback: @escaping (Bool) -> Void) {
let js = "layout.appForm.formValidation('\(routeName)', '\(opinion)')"
DDLogDebug("执行验证:\(js)")
webView.evaluateJavaScript(js) { (data, err) in
if let str = data {
if let str = data {
if str is Bool {
callback((str as! Bool))
}else {
} else {
let isVaild = str as? String
if isVaild == "true" {
callback(true)
}else {
} else {
callback(false)
}
}
}else {
} else {
DDLogError("没有返回值。。。。。。。。。")
callback(false)
}
}
}
@objc func itemBtnNextProcessAction() {
DDLogDebug("btnNext Process")
//校验表单
webView.evaluateJavaScript(TodoTaskJS.CHECK_FORM) { (data, err) in
if let str = data {
if let str = data {
let isVaild = str as! Bool
if isVaild == true {
self.setupData()
self.group.notify(queue: DispatchQueue.main, execute: {
self.performSegue(withIdentifier: "showTodoProcessSegue", sender: nil)
})
}else{
} else {
DDLogError("表单验证失败。。。。。。。。。。。。")
self.showError(title: "表单验证失败，请正确填写表单内容")
}
}else {
} else {
DDLogError("没有返回值。。。。。。。。。")
self.showError(title: "表单验证失败，请正确填写表单内容")
}
......@@ -368,22 +368,22 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
// }
}
@objc func itemBtnReadDocAction() {
DDLogDebug("readButtonAction")
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(ReadContext.readContextKey, query: ReadContext.readProcessing, parameter: ["##id##":(todoTask?.id)! as AnyObject])
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(ReadContext.readContextKey, query: ReadContext.readProcessing, parameter: ["##id##": (todoTask?.id)! as AnyObject])
self.showLoading(title: "提交中...")
Alamofire.request(url!, method:.post, parameters: myRead, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
Alamofire.request(url!, method: .post, parameters: myRead, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
switch response.result {
case .success(let val):
DDLogDebug(JSON(val).description)
let json = JSON(val)
if json["type"]=="success"{
if json["type"] == "success" {
self.showSuccess(title: "提交成功")
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.3, execute: {
self.goBack()
})
}else {
self.goBack()
})
} else {
DDLogError(json["message"].description)
self.showError(title: "提交失败")
}
......@@ -393,22 +393,22 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
}
}
@objc func itemBtnRetractDocAction() {
DDLogDebug("撤回开始。。。")
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskedContext.taskedContextKey, query: TaskedContext.taskedRetractQuery, parameter: ["##work##":(self.workId)! as AnyObject])
let url = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskedContext.taskedContextKey, query: TaskedContext.taskedRetractQuery, parameter: ["##work##": (self.workId)! as AnyObject])
self.showLoading(title: "提交中...")
Alamofire.request(url!, method:.put, parameters: nil, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
Alamofire.request(url!, method: .put, parameters: nil, encoding: JSONEncoding.default, headers: nil).responseJSON { response in
switch response.result {
case .success(let val):
DDLogDebug(JSON(val).description)
let json = JSON(val)
if json["type"]=="success"{
if json["type"] == "success" {
self.showSuccess(title: "提交成功")
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.3, execute: {
self.goBack()
})
}else {
self.goBack()
})
} else {
DDLogError(json["message"].description)
self.showError(title: "提交失败")
}
......@@ -418,7 +418,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
}
}
// 网页加载完成后，获取表单数据 判断是什么表单 待办 待阅 已办 已阅
private func loadDataFromWork() {
......@@ -430,7 +430,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
if err == nil && data != nil {
let json = JSON.init(parseJSON: data as! String)
self.myRead = json.dictionaryObject! as [String: AnyObject]
}else {
} else {
DDLogError(String(describing: err))
}
self.group.leave()
......@@ -445,7 +445,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
let json = JSON.init(parseJSON: (data as! String))
DDLogDebug("control: \(data as! String)")
self.myControl = json.dictionaryObject! as [String: AnyObject]
}else {
} else {
DDLogError(String(describing: err))
}
self.group.leave()
......@@ -454,24 +454,24 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
if myTitle == nil || myTitle!.trim().isEmpty {
group.enter()
DispatchQueue.main.async(group: group, execute: DispatchWorkItem(block: {
DDLogDebug("执行 \(TodoTaskJS.DATA_WORK_TITLE)")
DDLogDebug("执行 \(TodoTaskJS.DATA_WORK_TITLE)")
self.webView.evaluateJavaScript(TodoTaskJS.DATA_WORK_TITLE, completionHandler: { (data, err) in
if err == nil && data != nil {
self.myTitle = data as? String
self.title = self.myTitle ?? ""
}else {
} else {
DDLogError(String(describing: err))
}
self.group.leave()
})
}))
}
group.notify(queue: DispatchQueue.main) {
self.setupToolbarItems()
}
}
//20190522 新版底部操作栏
private func setupToolbarItemsNew() {
var items: [UIBarButtonItem] = []
......@@ -502,7 +502,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
items.append(secondButtonItem)
items.append(spaceItem)
}
// 更多按钮
if self.myNewControls.count > 2 {
let moreButton = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 30))
......@@ -516,12 +516,12 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
self.clickNewActionButton(action: item)
}
}
if items.count > 0 {
self.layoutBottomBar(items: items)
self.layoutBottomBar(items: items)
}
}
//新版操作按钮点击动作
private func clickNewActionButton(action: WorkNewActionItem) {
DDLogDebug("click .....\(action.text)")
......@@ -534,7 +534,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
DDLogDebug("actionScript excute finish!!!!")
}
}
}else {
} else {
let control = action.control
switch control {
case "allowDelete":
......@@ -563,12 +563,12 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
}
}
private func setupToolbarItems() {
DDLogDebug("setupToolbarItems 处理底部按钮， 根据control")
if self.myNewControls.count > 0 { //新版操作按钮
self.setupToolbarItemsNew()
}else {
} else {
var items: [UIBarButtonItem] = []
if self.myControl != nil {
let spaceItem = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: self, action: nil)
......@@ -588,7 +588,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
}
if let allowSave = self.myControl!["allowSave"] as? Bool {
if allowSave {// 保存工作
if allowSave { // 保存工作
DDLogDebug("保存工作。。。。。。。。。。。。。。。。。。。。。。安装按钮")
let saveBtn = UIButton(frame: CGRect(x: 0, y: 0, width: 30, height: 30))
saveBtn.setTitle("保存", for: .normal)
......@@ -609,7 +609,7 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
processingBtn.setTitle("继续流转", for: .normal)
processingBtn.setTitleColor(base_color, for: .normal)
processingBtn.addTapGesture { (tap) in
self.itemBtnNextProcessAction()
self.itemBtnNextProcessAction()
}
let processingItem = UIBarButtonItem(customView: processingBtn)
items.append(spaceItem)
......@@ -649,12 +649,12 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
}
self.layoutBottomBar(items: items)
NSLog("\(self.view.subviews)");
}else {
} else {
DDLogError("没有control 数据异常 按钮无法计算。。。。")
}
}
}
private func layoutBottomBar(items: [UIBarButtonItem]) {
if items.count > 0 {
self.toolbarView.items = items
......@@ -662,15 +662,15 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
self.view.addSubview(self.toolbarView)
self.toolbarView.translatesAutoresizingMaskIntoConstraints = false
let heightC = NSLayoutConstraint(item: self.toolbarView!, attribute: NSLayoutConstraint.Attribute.height, relatedBy: NSLayoutConstraint.Relation.equal, toItem: nil, attribute: NSLayoutConstraint.Attribute.notAnAttribute, multiplier: 0.0, constant: 44)
self.toolbarView.addConstraint(heightC)
let bottom = NSLayoutConstraint(item: self.toolbarView!, attribute: NSLayoutConstraint.Attribute.bottom, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.view, attribute: NSLayoutConstraint.Attribute.bottom, multiplier: 1, constant: 0)
let trailing = NSLayoutConstraint(item: self.toolbarView!, attribute: NSLayoutConstraint.Attribute.trailing, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.view, attribute: NSLayoutConstraint.Attribute.trailing, multiplier: 1, constant: 0)
let leading = NSLayoutConstraint(item: self.toolbarView!, attribute: NSLayoutConstraint.Attribute.leading, relatedBy: NSLayoutConstraint.Relation.equal, toItem: self.view, attribute: NSLayoutConstraint.Attribute.leading, multiplier: 1, constant: 0)
self.view.addConstraints([bottom, leading, trailing])
self.view.constraints.forEach { (constraint) in
if constraint.identifier == "webViewBottomConstraint" {
......@@ -682,11 +682,11 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
self.view.layoutIfNeeded()
}
}
/**
* 读取从页面载入的业务及流程数据，建立数据模型
*/
func setupData(){
func setupData() {
group.enter()
DispatchQueue.main.async(group: group, execute: DispatchWorkItem(block: {
DDLogInfo("opinion queue .....")
......@@ -696,13 +696,13 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
DDLogInfo("opinion: \(opinion)")
if opinion == "\"\"" {
self.taskProcess.opinion = ""
}else {
} else {
let json = JSON.init(parseJSON: opinion)
let oJson = json.dictionaryObject as [String : AnyObject]?
let oJson = json.dictionaryObject as [String: AnyObject]?
let op = oJson?["opinion"] as? String
self.taskProcess.opinion = op
}
}else {
} else {
DDLogError(String(describing: err))
}
self.group.leave()
......@@ -715,62 +715,62 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
if err == nil && data != nil {
DDLogDebug("taskQueue complete")
let json = JSON.init(parseJSON: data as! String)
self.taskProcess.taskDict = json.dictionaryObject! as [String : AnyObject]
self.taskProcess.taskDict = json.dictionaryObject! as [String: AnyObject]
self.taskProcess.taskId = self.taskProcess.taskDict!["id"] as? String
self.taskProcess.decisonList = self.taskProcess.taskDict!["routeNameList"] as? [String]
}else{
} else {
DDLogError(String(describing: err))
self.isJSExecuted = false
}
self.group.leave()
}
}))
group.enter()
DispatchQueue.main.async(group: group, execute: DispatchWorkItem(block: {
DDLogDebug("workQueue 1")
self.webView.evaluateJavaScript(TodoTaskJS.DATA_WORK) { (data, err) in
if err == nil && data != nil {
if err == nil && data != nil {
DDLogDebug("workQueue complete")
let json = JSON.init(parseJSON: data as! String)
self.taskProcess.workDict = json.dictionaryObject! as [String : AnyObject]
self.taskProcess.workDict = json.dictionaryObject! as [String: AnyObject]
self.taskProcess.workId = self.taskProcess.workDict!["id"] as? String
}else{
} else {
DDLogError(String(describing: err))
self.isJSExecuted = false
}
self.group.leave()
}
}))
group.enter()
DispatchQueue.main.async(group: group, execute: DispatchWorkItem(block: {
DispatchQueue.main.async(group: group, execute: DispatchWorkItem(block: {
DDLogDebug("businessQueue 1")
self.webView.evaluateJavaScript(TodoTaskJS.DATA_BUSINESS) { (data, err) in
if err == nil && data != nil {
if err == nil && data != nil {
DDLogDebug("businessQueue complete")
let json = JSON.init(parseJSON: data as! String)
self.taskProcess.businessDataDict = json.dictionaryObject! as [String : AnyObject]
self.taskProcess.businessDataDict = json.dictionaryObject! as [String: AnyObject]
//do {
//}catch{
//DDLogError("set routeNameList Error")
//DDLogError("set routeNameList Error")
//}
}else{
} else {
DDLogError(String(describing: err))
self.isJSExecuted = false
}
self.group.leave()
}
}))
}
}
......@@ -778,28 +778,28 @@ class TodoTaskDetailViewController: BaseWebViewUIViewController {
extension TodoTaskDetailViewController:WKNavigationDelegate,WKUIDelegate {
extension TodoTaskDetailViewController: WKNavigationDelegate, WKUIDelegate {
func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
DDLogDebug("didStartProvisionalNavigation")
}
func webView(_ webView: WKWebView, didCommit navigation: WKNavigation!) {
DDLogDebug("didCommit")
}
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
DDLogDebug("didFinish")
}
func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
DDLogDebug("didFail")
DDLogError(error.localizedDescription)
self.showError(title: "工作加载异常！")
}
}
extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
......@@ -811,7 +811,7 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
self.goBack()
break
case "appFormLoaded":
DDLogDebug("appFormLoaded 当前方法已经弃用。。。。")
DDLogDebug("appFormLoaded 当前方法已经弃用。。。。")
// if let newControls = (message.body as? NSString) {
// let str = newControls as String
// DDLogDebug("appFormLoaded , controls :\(str)")
......@@ -833,7 +833,7 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
if zoneStatus == ZoneAuthorizationStatus.zAuthorizationStatusAuthorized {
let site = (message.body as! NSDictionary)["site"]
self.uploadAttachment(site as! String)
}else {
} else {
//显示
self.gotoApplicationSettings(alertMessage: "需要照片允许访问权限，是否跳转到手机设置页面开启相机权限？")
}
......@@ -852,132 +852,132 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
let url = (message.body as! NSString)
self.downloadDocumentAndPreview(String(url))
break
default:
DDLogError("未知方法名：\(name)！")
break
}
}
//上传附件
private func uploadAttachment(_ site:String){
private func uploadAttachment(_ site: String) {
//选择附件上传
let updloadURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskUploadAttachmentQuery, parameter: ["##workId##":workId as AnyObject])
let updloadURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskUploadAttachmentQuery, parameter: ["##workId##": workId as AnyObject])
self.uploadAttachment(site, uploadURL: updloadURL!)
}
private func uploadAttachment(_ site:String,uploadURL url:String){
private func uploadAttachment(_ site: String, uploadURL url: String) {
let vc = FileBSImagePickerViewController().bsImagePicker()
presentImagePicker(vc, select: { (asset: PHAsset) -> Void in
// User selected an asset.
// Do something with it, start upload perhaps?
// User selected an asset.
// Do something with it, start upload perhaps?
}, deselect: { (asset: PHAsset) -> Void in
// User deselected an assets.
// Do something, cancel upload?
}, cancel: { (assets: [PHAsset]) -> Void in
// User cancelled. And this where the assets currently selected.
}, finish: { (assets: [PHAsset]) -> Void in
for asset in assets {
switch asset.mediaType {
case .audio:
DDLogDebug("Audio")
case .image:
let options = PHImageRequestOptions()
options.isSynchronous = true
options.deliveryMode = .fastFormat
options.resizeMode = .none
PHImageManager.default().requestImageData(for: asset, options: options, resultHandler: { (imageData, result, imageOrientation, dict) in
//DDLogDebug("result = \(result) imageOrientation = \(imageOrientation) \(dict)")
var fileName = ""
if dict?["PHImageFileURLKey"] != nil {
let fileURL = dict?["PHImageFileURLKey"] as! URL
fileName = fileURL.lastPathComponent
}else {
fileName = result ?? "untitle.png"
}
DispatchQueue.main.async {
self.showLoading(title: "上传中...")
}
var newData = imageData
//处理图片旋转的问题
if imageOrientation != UIImage.Orientation.up && imageData != nil {
let newImage = UIImage(data: imageData!)?.fixOrientation()
if newImage != nil {
newData = newImage?.pngData()
// User deselected an assets.
// Do something, cancel upload?
}, cancel: { (assets: [PHAsset]) -> Void in
// User cancelled. And this where the assets currently selected.
}, finish: { (assets: [PHAsset]) -> Void in
for asset in assets {
switch asset.mediaType {
case .audio:
DDLogDebug("Audio")
case .image:
let options = PHImageRequestOptions()
options.isSynchronous = true
options.deliveryMode = .fastFormat
options.resizeMode = .none
PHImageManager.default().requestImageData(for: asset, options: options, resultHandler: { (imageData, result, imageOrientation, dict) in
//DDLogDebug("result = \(result) imageOrientation = \(imageOrientation) \(dict)")
var fileName = ""
if dict?["PHImageFileURLKey"] != nil {
let fileURL = dict?["PHImageFileURLKey"] as! URL
fileName = fileURL.lastPathComponent
} else {
fileName = result ?? "untitle.png"
}
}
DispatchQueue.global(qos: .userInitiated).async {
Alamofire.upload(multipartFormData: { (mData) in
//mData.append(fileURL, withName: "file")
mData.append(newData!, withName: "file", fileName: fileName, mimeType: "application/octet-stream")
let siteData = site.data(using: String.Encoding.utf8, allowLossyConversion: false)
mData.append(siteData!, withName: "site")
}, to: url, encodingCompletion: { (encodingResult) in
switch encodingResult {
case .success(let upload, _, _):
debugPrint(upload)
upload.responseJSON {
respJSON in
switch respJSON.result {
case .success(let val):
let attachId = JSON(val)["data"]["id"].string!
DispatchQueue.main.async {
//ProgressHUD.showSuccess("上传成功")
let callJS = "layout.appForm.uploadedAttachment(\"\(site)\", \"\(attachId)\")"
self.webView.evaluateJavaScript(callJS, completionHandler: { (result, err) in
self.showSuccess(title: "上传成功")
})
DispatchQueue.main.async {
self.showLoading(title: "上传中...")
}
var newData = imageData
//处理图片旋转的问题
if imageOrientation != UIImage.Orientation.up && imageData != nil {
let newImage = UIImage(data: imageData!)?.fixOrientation()
if newImage != nil {
newData = newImage?.pngData()
}
}
DispatchQueue.global(qos: .userInitiated).async {
Alamofire.upload(multipartFormData: { (mData) in
//mData.append(fileURL, withName: "file")
mData.append(newData!, withName: "file", fileName: fileName, mimeType: "application/octet-stream")
let siteData = site.data(using: String.Encoding.utf8, allowLossyConversion: false)
mData.append(siteData!, withName: "site")
}, to: url, encodingCompletion: { (encodingResult) in
switch encodingResult {
case .success(let upload, _, _):
debugPrint(upload)
upload.responseJSON {
respJSON in
switch respJSON.result {
case .success(let val):
let attachId = JSON(val)["data"]["id"].string!
DispatchQueue.main.async {
//ProgressHUD.showSuccess("上传成功")
let callJS = "layout.appForm.uploadedAttachment(\"\(site)\", \"\(attachId)\")"
self.webView.evaluateJavaScript(callJS, completionHandler: { (result, err) in
self.showSuccess(title: "上传成功")
})
}
case .failure(let err):
DispatchQueue.main.async {
DDLogError(err.localizedDescription)
self.showError(title: "上传失败")
}
break
}
}
case .failure(let err):
case .failure(let errType):
DispatchQueue.main.async {
DDLogError(err.localizedDescription)
DDLogError(errType.localizedDescription)
self.showError(title: "上传失败")
}
break
}
}
case .failure(let errType):
DispatchQueue.main.async {
DDLogError(errType.localizedDescription)
self.showError(title: "上传失败")
}
}
})
}
})
case .video:
DDLogDebug("Unknown")
case .unknown:
DDLogDebug("Unknown")
@unknown default:
DDLogDebug("Unknown")
})
}
})
case .video:
DDLogDebug("Unknown")
case .unknown:
DDLogDebug("Unknown")
@unknown default:
DDLogDebug("Unknown")
}
}
}
}, completion: nil)
}, completion: nil)
}
//下载预览附件
private func downloadAttachment(_ attachmentId:String){
private func downloadAttachment(_ attachmentId: String) {
//生成两个URL，一个获取附件信息，一个链接正式下载
var infoURL:String?,downURL:String?
var infoURL: String?, downURL: String?
if isWorkCompeleted {
infoURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskedContext.taskedContextKey, query: TaskedContext.taskedGetAttachmentInfoQuery, parameter: ["##attachmentId##":attachmentId as AnyObject,"##workcompletedId##":workId as AnyObject])
downURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskedContext.taskedContextKey, query: TaskedContext.taskedGetAttachmentQuery, parameter:["##attachmentId##":attachmentId as AnyObject,"##workcompletedId##":workId as AnyObject])
}else{
infoURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskGetAttachmentInfoQuery, parameter: ["##attachmentId##":attachmentId as AnyObject,"##workId##":workId as AnyObject])
downURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskGetAttachmentQuery, parameter:["##attachmentId##":attachmentId as AnyObject,"##workId##":workId as AnyObject])
infoURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskedContext.taskedContextKey, query: TaskedContext.taskedGetAttachmentInfoQuery, parameter: ["##attachmentId##": attachmentId as AnyObject, "##workcompletedId##": workId as AnyObject])
downURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskedContext.taskedContextKey, query: TaskedContext.taskedGetAttachmentQuery, parameter: ["##attachmentId##": attachmentId as AnyObject, "##workcompletedId##": workId as AnyObject])
} else {
infoURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskGetAttachmentInfoQuery, parameter: ["##attachmentId##": attachmentId as AnyObject, "##workId##": workId as AnyObject])
downURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskGetAttachmentQuery, parameter: ["##attachmentId##": attachmentId as AnyObject, "##workId##": workId as AnyObject])
}
self.showAttachViewInController(infoURL!, downURL!)
}
private func showAttachViewInController(_ infoURL:String,_ downURL:String){
private func showAttachViewInController(_ infoURL: String, _ downURL: String) {
self.showLoading(title: "下载中...")
DDLogDebug("infoUrl:\(infoURL) ,down url:\(downURL)")
Alamofire.request(infoURL).responseJSON { (response) in
......@@ -988,17 +988,17 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
//执行下载
let destination: DownloadRequest.DownloadFileDestination = { _, _ in
let documentsURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)[0]
let fileURL = documentsURL.appendingPathComponent((info?.data?.name)!)
return (fileURL, [.removePreviousFile, .createIntermediateDirectories])
}
Alamofire.download(downURL, to: destination).response(completionHandler: { (response) in
if response.error == nil , let fileurl = response.destinationURL?.path {
if response.error == nil, let fileurl = response.destinationURL?.path {
//打开文件
self.hideLoading()
self.previewAttachment(fileurl)
}else{
} else {
DispatchQueue.main.async {
self.showError(title: "预览文件出错")
}
......@@ -1014,15 +1014,15 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
}
}
}
//替换附件
private func replaceAttachment(_ attachmentId:String, _ site:String){
private func replaceAttachment(_ attachmentId: String, _ site: String) {
//替换结束后回调js名称
let replaceURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskUpReplaceAttachmentQuery, parameter: ["##attachmentId##":attachmentId as AnyObject,"##workId##":workId as AnyObject])!
let replaceURL = AppDelegate.o2Collect.generateURLWithAppContextKey(TaskContext.taskContextKey, query: TaskContext.todoTaskUpReplaceAttachmentQuery, parameter: ["##attachmentId##": attachmentId as AnyObject, "##workId##": workId as AnyObject])!
self.replaceAttachment(site, attachmentId, replaceURL: replaceURL)
}
/**
* 下载公文 并阅览
**/
......@@ -1037,14 +1037,14 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
return (fileURL, [.removePreviousFile, .createIntermediateDirectories])
}
Alamofire.download(url, to: localFileDestination).response(completionHandler: { (response) in
if response.error == nil , let fileurl = response.destinationURL?.path {
if response.error == nil, let fileurl = response.destinationURL?.path {
DDLogDebug("文件地址：\(fileurl)")
let newUrl = self.dealDocFileSaveAsDocx(fileUrl: response.destinationURL!)
DDLogDebug("处理过的文件地址：\(newUrl.path)")
//打开文件
self.hideLoading()
self.previewAttachment(newUrl.path)
}else{
} else {
let msg = response.error?.localizedDescription ?? ""
DDLogError("下载文件出错，\(msg)")
DispatchQueue.main.async {
......@@ -1053,96 +1053,96 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
}
})
}
private func replaceAttachment(_ site:String,_ attachmentId:String,replaceURL url:String){
private func replaceAttachment(_ site: String, _ attachmentId: String, replaceURL url: String) {
let vc = FileBSImagePickerViewController().bsImagePicker()
presentImagePicker(vc, select: { (asset: PHAsset) -> Void in
// User selected an asset.
// Do something with it, start upload perhaps?
// User selected an asset.
// Do something with it, start upload perhaps?
}, deselect: { (asset: PHAsset) -> Void in
// User deselected an assets.
// Do something, cancel upload?
}, cancel: { (assets: [PHAsset]) -> Void in
// User cancelled. And this where the assets currently selected.
}, finish: { (assets: [PHAsset]) -> Void in
for asset in assets {
switch asset.mediaType {
case .audio:
DDLogDebug("Audio")
case .image:
let options = PHImageRequestOptions()
options.isSynchronous = true
options.deliveryMode = .fastFormat
options.resizeMode = .none
PHImageManager.default().requestImageData(for: asset, options: options, resultHandler: { (imageData, result, imageOrientation, dict) in
//DDLogDebug("result = \(result) imageOrientation = \(imageOrientation) \(dict)")
let fileURL = dict?["PHImageFileURLKey"] as! URL
DispatchQueue.main.async {
self.showLoading(title: "上传中...")
}
DispatchQueue.global(qos: .userInitiated).async {
Alamofire.upload(multipartFormData: { (mData) in
//mData.append(fileURL, withName: "file")
mData.append(imageData!, withName: "file", fileName: fileURL.lastPathComponent, mimeType: "application/octet-stream")
let siteData = site.data(using: String.Encoding.utf8, allowLossyConversion: false)
mData.append(siteData!, withName: "site")
}, usingThreshold: SessionManager.multipartFormDataEncodingMemoryThreshold, to: url, method: .put, headers: nil, encodingCompletion: { (encodingResult) in
switch encodingResult {
case .success(let upload, _, _):
debugPrint(upload)
upload.responseJSON {
respJSON in
switch respJSON.result {
case .success( _):
//let attachId = JSON(val)["data"]["id"].string!
DispatchQueue.main.async {
//ProgressHUD.showSuccess("上传成功")
let callJS = "layout.appForm.replacedAttachment(\"\(site)\", \"\(attachmentId)\")"
self.webView.evaluateJavaScript(callJS, completionHandler: { (result, err) in
self.showSuccess(title: "替换成功")
})
// User deselected an assets.
// Do something, cancel upload?
}, cancel: { (assets: [PHAsset]) -> Void in
// User cancelled. And this where the assets currently selected.
}, finish: { (assets: [PHAsset]) -> Void in
for asset in assets {
switch asset.mediaType {
case .audio:
DDLogDebug("Audio")
case .image:
let options = PHImageRequestOptions()
options.isSynchronous = true
options.deliveryMode = .fastFormat
options.resizeMode = .none
PHImageManager.default().requestImageData(for: asset, options: options, resultHandler: { (imageData, result, imageOrientation, dict) in
//DDLogDebug("result = \(result) imageOrientation = \(imageOrientation) \(dict)")
let fileURL = dict?["PHImageFileURLKey"] as! URL
DispatchQueue.main.async {
self.showLoading(title: "上传中...")
}
DispatchQueue.global(qos: .userInitiated).async {
Alamofire.upload(multipartFormData: { (mData) in
//mData.append(fileURL, withName: "file")
mData.append(imageData!, withName: "file", fileName: fileURL.lastPathComponent, mimeType: "application/octet-stream")
let siteData = site.data(using: String.Encoding.utf8, allowLossyConversion: false)
mData.append(siteData!, withName: "site")
}, usingThreshold: SessionManager.multipartFormDataEncodingMemoryThreshold, to: url, method: .put, headers: nil, encodingCompletion: { (encodingResult) in
switch encodingResult {
case .success(let upload, _, _):
debugPrint(upload)
upload.responseJSON {
respJSON in
switch respJSON.result {
case .success(_):
//let attachId = JSON(val)["data"]["id"].string!
DispatchQueue.main.async {
//ProgressHUD.showSuccess("上传成功")
let callJS = "layout.appForm.replacedAttachment(\"\(site)\", \"\(attachmentId)\")"
self.webView.evaluateJavaScript(callJS, completionHandler: { (result, err) in
self.showSuccess(title: "替换成功")
})
}
case .failure(let err):
DispatchQueue.main.async {
DDLogError(err.localizedDescription)
self.showError(title: "替换失败")
}
break
}
}
case .failure(let err):
case .failure(let errType):
DispatchQueue.main.async {
DDLogError(err.localizedDescription)
DDLogError(errType.localizedDescription)
self.showError(title: "替换失败")
}
break
}
}
case .failure(let errType):
DispatchQueue.main.async {
DDLogError(errType.localizedDescription)
self.showError(title: "替换失败")
}
}
})
})
}
})
case .video:
let options = PHVideoRequestOptions()
options.deliveryMode = .fastFormat
options.isNetworkAccessAllowed = true
options.progressHandler = { (progress, err, stop, dict) in
DDLogDebug("progress = \(progress) dict = \(String(describing: dict))")
}
})
case .video:
let options = PHVideoRequestOptions()
options.deliveryMode = .fastFormat
options.isNetworkAccessAllowed = true
options.progressHandler = { (progress,err, stop,dict) in
DDLogDebug("progress = \(progress) dict = \(String(describing: dict))")
PHImageManager.default().requestAVAsset(forVideo: asset, options: options, resultHandler: { (avAsset, avAudioMx, dict) in
})
case .unknown:
DDLogDebug("Unknown")
@unknown default:
DDLogDebug("Unknown")
}
PHImageManager.default().requestAVAsset(forVideo: asset, options: options, resultHandler: { (avAsset, avAudioMx, dict) in
})
case .unknown:
DDLogDebug("Unknown")
@unknown default:
DDLogDebug("Unknown")
}
}
}, completion: nil)
}, completion: nil)
}
private func previewAttachment(_ url:String){
private func previewAttachment(_ url: String) {
let currentURL = NSURL(fileURLWithPath: url)
if QLPreviewController.canPreview(currentURL) {
qlController.currentFileURLS.removeAll(keepingCapacity: true)
......@@ -1152,20 +1152,20 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
let navVC = ZLNormalNavViewController(rootViewController: qlController)
qlController.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "关闭", style: .plain, target: qlController, action: #selector(qlController.qlCloseWindow))
self.presentVC(navVC)
}else{
} else {
self.pushVC(qlController)
}
}else{
} else {
self.showError(title: "此文件无法预览，请在PC端查看")
}
}
//处理特殊情况 docx的文件有可能是doc 需要判断下文件信息头
private func dealDocFileSaveAsDocx(fileUrl: URL) -> URL {
if fileUrl.pathExtension == "docx" {
......@@ -1177,13 +1177,13 @@ extension TodoTaskDetailViewController: O2WKScriptMessageHandlerImplement {
DDLogDebug("copy 了一个 文件。。。。。。")
try FileManager.default.copyItem(at: fileUrl, to: newURL)
return newURL
}catch {
} catch {
DDLogError(error.localizedDescription)
}
}
}
}
return fileUrl
}
}
......
o2ios/O2Platform/Info.plist
浏览文件 @ 681cafca
......@@ -163,11 +163,11 @@
<key>centerContext</key>
<string>/x_program_center</string>
<key>centerHost</key>
<string>sample.o2oa.net</string>
<string>123.125.39.51</string>
<key>centerPort</key>
<integer>40030</integer>
<integer>20030</integer>
<key>httpProtocol</key>
<string>https</string>
<string>http</string>
<key>id</key>
<string>o2CenterServer</string>
<key>name</key>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或