no message

IFS/IFS.xcodeproj/project.pbxproj

@@ -156,6 +156,7 @@
 		34CB3FB021097B0400E41667 /* TreeFliteLocationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CB3FAE21097B0400E41667 /* TreeFliteLocationCell.xib */; };
 		34CB3FB52109979C00E41667 /* NRSomeTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34CB3FB42109979C00E41667 /* NRSomeTool.swift */; };
 		34D514292109683600E0B577 /* TreeLocationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34D514282109683600E0B577 /* TreeLocationModel.swift */; };
+		34F633A9210B1A7B0021FCF6 /* URL+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34F633A8210B1A7B0021FCF6 /* URL+Extension.swift */; };
 		8E99375C209056F5000CF486 /* Appdelegate+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E99375B209056F5000CF486 /* Appdelegate+Extension.swift */; };
 		F04C5934BDBBB8EA12141331 /* Pods_IFS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35B66002AC5D38FD80592FA3 /* Pods_IFS.framework */; };
 /* End PBXBuildFile section */
@@ -322,6 +323,7 @@
 		34CB3FAE21097B0400E41667 /* TreeFliteLocationCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TreeFliteLocationCell.xib; sourceTree = "<group>"; };
 		34CB3FB42109979C00E41667 /* NRSomeTool.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRSomeTool.swift; sourceTree = "<group>"; };
 		34D514282109683600E0B577 /* TreeLocationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TreeLocationModel.swift; sourceTree = "<group>"; };
+		34F633A8210B1A7B0021FCF6 /* URL+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "URL+Extension.swift"; sourceTree = "<group>"; };
 		35B66002AC5D38FD80592FA3 /* Pods_IFS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_IFS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8E99375A2090550C000CF486 /* IFS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = IFS.entitlements; sourceTree = "<group>"; };
 		8E99375B209056F5000CF486 /* Appdelegate+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Appdelegate+Extension.swift"; sourceTree = "<group>"; };
@@ -1019,6 +1021,7 @@
 		34CB3FB12109957800E41667 /* Tool */ = {
 			isa = PBXGroup;
 			children = (
+				34F633A8210B1A7B0021FCF6 /* URL+Extension.swift */,
 				34CB3FB42109979C00E41667 /* NRSomeTool.swift */,
 			);
 			path = Tool;
@@ -1337,6 +1340,7 @@
 				29EA0C181FEA3156005A6170 /* EmptyTableViewCell.swift in Sources */,
 				29278C412004986800656DF1 /* TodoResultModel.swift in Sources */,
 				29DA417620035B3C002762A2 /* RepairBeforAttachmentTableViewCell.swift in Sources */,
+				34F633A9210B1A7B0021FCF6 /* URL+Extension.swift in Sources */,
 				29F6B8EC2007488C00EE4630 /* DeviceModel.swift in Sources */,
 				29EA0C161FEA3156005A6170 /* Network.swift in Sources */,
 				2942D70520231C3200CB07F9 /* EditImageViewController.swift in Sources */,

IFS/IFS/Expand/Const/Urls.swift

@@ -20,8 +20,8 @@ import Foundation
 //public let BaseUrl: String="http://183.221.125.236:7080/ifs-server/rest/"
 //public let BaseAttachmentUrl: String="http://183.221.125.236:7080"
 ////重庆IFS正式环境
-//public let BaseUrl: String="http://222.180.250.18:7090/ifs-server/rest/"
-//public let BaseAttachmentUrl: String="http://222.180.250.18:7090"
+public let BaseUrl: String="http://222.180.250.18:7090/ifs-server/rest/"
+public let BaseAttachmentUrl: String="http://222.180.250.18:7090"
 
 //正式环境
 //public let BaseUrl: String = "http://222.180.250.18:7090/ifs-server/rest"
@@ -32,8 +32,8 @@ import Foundation
 //public let BaseAttachmentUrl: String = "http://183.221.125.236:7080"
 
 //外网开发环境
-public let BaseUrl: String = "http://dev.gomoretech.com/ifs-server/rest"
-public let BaseAttachmentUrl: String = "http://dev.gomoretech.com"
+//public let BaseUrl: String = "http://dev.gomoretech.com/ifs-server/rest"
+//public let BaseAttachmentUrl: String = "http://dev.gomoretech.com"
 
 /// 登录
 public let loginUrl: String = "/user/login/%@"
@@ -75,9 +75,9 @@ public let organizationUrl : String = "/organization/query"
 /// 工单详情转交
 public let batchTransferUrl : String = "/work/batchTransfer"
 ///// 工单详情完成
-//public let completedBillUrl: String = "/work/finish"
+public let completedBillUrl: String = "/work/finish"
 /// 工单详情完成
-public let completedBillUrl: String = "/work/finishWorkBill"
+//public let completedBillUrl: String = "/work/finishWorkBill"
 
 /// 主管指引/备件/工具
 public let toolOptionUrl: String = "/config/getValue/toolOption"

IFS/IFS/Expand/Network/NetworkAPI.swift

@@ -152,9 +152,9 @@ extension Service: TargetType {
             return brokenOptionUrl
         case .QueryprocessMethods:
             return processMethodsUrl
-        case .CompleteOrder(let model):
-//            let path = completedBillUrl + "?operator.operId=\(kUser().userCode!)&operator.operName=\(kUser().userName!)&time=\(NSDate().httpParameterString()!)"
-            let path = completedBillUrl + "/\(model.uuid ?? "")"
+        case .CompleteOrder(_):
+            let path = completedBillUrl + "?operator.operId=\(kUser().userCode!)&operator.operName=\(kUser().userName!)&time=\(NSDate().httpParameterString()!)"
+//            let path = completedBillUrl + "/\(model.uuid ?? "")"
             return path.urlEncoded()
         case .UploadAttachment(let model):
             return String(format: uploadAttachmentUrl, model.entityType,model.entityUuid)

IFS/IFS/Main/Business/RepairOrder/Controller/EditImageViewController.swift

@@ -58,7 +58,7 @@ class EditImageViewController: BaseViewController {
                 return
             }
             let imageString =  String(format: attachmentUrl, attachment!.entityType,attachment!.entityUuid,attachment!.fileName)
-            attachmentImg.kf.setImage(with: URL(string: imageString), placeholder: loadingImage)
+            attachmentImg.kf.setImage(with: URL.encoderURL(encoderString: imageString), placeholder: loadingImage)
             selectedTableView.register(UITableViewCell.classForCoder(), forCellReuseIdentifier: UITableViewCell.name())
             view.addSubview(selectedTableView)
             selectedTableView.selectRow(at: IndexPath(row: 0, section: 0), animated: true, scrollPosition: .top)
@@ -76,6 +76,10 @@ class EditImageViewController: BaseViewController {
             ShowMessage("请先实现回调方法")
             return
         }
+        guard attachmentImg.image != nil else {
+            ShowMessage("当前楼层无位置图")
+            return
+        }
         popVC()
         let string = saveImage(currentImage: capture(attachmentImg), persent: 1, imageName: "editAttachmentImage")
         saveImageBlock!(string)
@@ -123,10 +127,15 @@ extension EditImageViewController: UITableViewDelegate,UITableViewDataSource  {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        guard imageArray[indexPath.row].attachments != nil && imageArray[indexPath.row].attachments.count > 0 else {
+            ShowMessage("当前楼层无位置图")
+            attachmentImg.image = nil
+            return
+        }
         let attachment = imageArray[indexPath.row].attachments.first!
         let imageString =  String(format: attachmentUrl, attachment.entityType,attachment.entityUuid,attachment.fileName)
         if type == .EDIT {
-            attachmentImg.kf.setImage(with: URL(string: imageString), placeholder: loadingImage)
+            attachmentImg.kf.setImage(with: URL.encoderURL(encoderString: imageString), placeholder: loadingImage)
         }else {
             attachmentImg.image = UIImage(contentsOfFile: imageString)
         }

IFS/IFS/Main/Business/RepairOrder/Model/BillCompletedRequestModel.swift

@@ -38,7 +38,8 @@ open class BillCompletedRequestModel : NSObject{
     var uuid : String!
     var version : Int!
     var workNo : String!
-    
+    var positionUuid:String!
+    var positionName:String!
     
     init(_ state: String) {
         self.state = state
@@ -77,6 +78,8 @@ open class BillCompletedRequestModel : NSObject{
         if !positionJson.isEmpty{
             position = UCN(fromJson: positionJson)
         }
+        positionUuid = json["positionUuid"].stringValue
+        positionName = json["positionName"].stringValue
         receiveTime = json["receiveTime"].stringValue
         let reportUserJson = json["reportUser"]
         if !reportUserJson.isEmpty{
@@ -154,6 +157,12 @@ open class BillCompletedRequestModel : NSObject{
         if reporterPhone != nil{
             dictionary["reporterPhone"] = reporterPhone
         }
+        if positionUuid != nil{
+            dictionary["positionUuid"] = positionUuid
+        }
+        if positionName != nil{
+            dictionary["positionName"] = positionName
+        }
         if requestTime != nil{
             dictionary["requestTime"] = requestTime
         }

IFS/IFS/Main/Business/RepairOrder/Model/RepairOrderDetailResultModel.swift

@@ -331,6 +331,12 @@ open class BillDetailData : NSObject{
         if workNo != nil{
             dictionary["workNo"] = workNo
         }
+        if positionUuid != nil{
+            dictionary["positionUuid"] = positionUuid
+        }
+        if positionName != nil{
+            dictionary["positionName"] = positionName
+        }
         return dictionary
     }
     

IFS/IFS/Main/Home/Tool/URL+Extension.swift

+//
+//  URL+Extension.swift
+//  LanStoreBusiness
+//
+//  Created by 飞迪1 on 2018/6/22.
+//  Copyright © 2018年 勾芒. All rights reserved.
+//
+
+import Foundation
+extension URL{
+    static func encoderURL(encoderString:String?)->URL?{
+        let string = encoderString ?? ""
+        let tmpUrl = URL(string: string)
+        if tmpUrl != nil{
+            return tmpUrl
+        }
+        let encodeString = string.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed) ?? ""
+        return URL(string: encodeString)
+    }
+}

IFS/IFS/Resource/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.5</string>
+	<string>1.0.7</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>