图文的新增和查看

ShorthandMaster/Input/Controller/SHInputController.swift

@@ -63,67 +63,61 @@ class SHInputController: SHBaseViewController
         self.shInputView.bottomView.stopAudioButton.addTarget(self, action: #selector(didSelectedStopAudioButton(sender:)), for: UIControl.Event.touchUpInside)
         self.shInputView.bottomView.keyboardButton.addTarget(self, action: #selector(didSelectedKeyboardButton(sender:)), for: UIControl.Event.touchUpInside)
     
-        // TODO: 先做新增, 查看和编辑稍后再做
-//        // 有记录显示记录
-//        if UserDefaults.standard.value(forKey: "InputRecord") != nil
-//        {
-//            self.shInputView.placeholder.isHidden = true
-//
-//            let historyDic : [String : Any] = UserDefaults.standard.value(forKey: "InputRecord") as! [String : Any]
-//
-//            let attributeString : NSMutableAttributedString = NSMutableAttributedString()
-//
-//            let titleString = NSAttributedString(string: historyDic["title"] as! String, attributes: (SHInputViewModel.titleAttributes() as! [NSAttributedString.Key : Any]))
-//            attributeString.append(titleString)
-////            self.viewModel.title = titleString.string
-//            self.dataModel.rename = titleString.string
-//
-//            let contentString = NSAttributedString(string: historyDic["content"] as! String, attributes: SHInputViewModel.contentAttributes() as? [NSAttributedString.Key : Any])
-//            attributeString.append(contentString)
-//
-//            let imageArray : Array = historyDic["imageArray"] as! Array<[String : Any]>
-//
-//            for imageDictionary : [String : Any] in imageArray
-//            {
-//                let imageDataString : String = imageDictionary["imageData"] as! String
-//
-//                let imageData : Data = NSData(base64Encoded: imageDataString, options: NSData.Base64DecodingOptions.ignoreUnknownCharacters)! as Data
-//                let image : UIImage = UIImage(data: imageData)!
-//
-//                // 调整图片大小, 宽相同, 高随比例变化
-//                let newWidth = kScreenWidth - 20 * 2
-//                let newHeight = newWidth * image.size.height / image.size.width
-//                let newSize = CGSize(width: newWidth, height: newHeight)
-//
-//                let imageLocation : Int = imageDictionary["imageLocation"] as! Int
-//
-//
-//                let attachment = NSTextAttachment.init()
-//                attachment.image = image
-//                attachment.bounds = CGRect(origin: CGPoint.zero, size: newSize)
-//                let imageString = NSMutableAttributedString(attachment: attachment)
-//
-//                // 设置图片文字属性
-//                imageString.addAttributes((SHInputViewModel.contentAttributes() as? [NSAttributedString.Key : Any])!, range: NSRange(location: 0, length: imageString.length))
-//                // 设置图片间距
-//                let paragraphStyle = NSMutableParagraphStyle()
-//                paragraphStyle.lineSpacing = 18
-//                imageString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: imageString.length))
-//
-//                attributeString.insert(imageString, at: imageLocation)
-//            }
-//
-//            self.shInputView.textView.attributedText = attributeString
-//        }
-//        else
-//        {
-//            // 默认文字样式
-//            self.shInputView.textView.typingAttributes = SHInputViewModel.titleAttributes() as! [NSAttributedString.Key : Any]
-//        }
+        // 有记录显示记录
+        if dataModel.rename.length > 0
+        {
+            self.shInputView.placeholder.isHidden = true
+
+            let attributeString : NSMutableAttributedString = NSMutableAttributedString()
+
+            let titleString = NSAttributedString(string: self.dataModel.rename, attributes: (SHInputViewModel.titleAttributes() as! [NSAttributedString.Key : Any]))
+            attributeString.append(titleString)
+
+            let contentString = NSAttributedString(string: self.dataModel.txt, attributes: SHInputViewModel.contentAttributes() as? [NSAttributedString.Key : Any])
+            attributeString.append(contentString)
+
+            let imagesPath : Array = self.dataModel.imagesPath
+            let imagesIndex : Array = self.dataModel.imagesIndex
+            
+            var i = 0
+            
+            for imagePath : String in imagesPath
+            {
+                let image : UIImage = UIImage(contentsOfFile: DocumentPath + imagePath) ?? UIImage()
+                
+                // 调整图片大小, 宽相同, 高随比例变化
+                let newWidth = kScreenWidth - 20 * 2
+                let newHeight = newWidth * image.size.height / image.size.width
+                let newSize = CGSize(width: newWidth, height: newHeight)
+
+                let imageLocation : Int = imagesIndex[i]
 
+
+                let attachment = NSTextAttachment.init()
+                attachment.image = image
+                attachment.bounds = CGRect(origin: CGPoint.zero, size: newSize)
+                let imageString = NSMutableAttributedString(attachment: attachment)
+
+                // 设置图片文字属性
+                imageString.addAttributes((SHInputViewModel.contentAttributes() as? [NSAttributedString.Key : Any])!, range: NSRange(location: 0, length: imageString.length))
+                // 设置图片间距
+                let paragraphStyle = NSMutableParagraphStyle()
+                paragraphStyle.lineSpacing = 18
+                imageString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: imageString.length))
+
+                attributeString.insert(imageString, at: imageLocation)
+                
+                i += 1
+            }
+
+            self.shInputView.textView.attributedText = attributeString
+        }
+        else
+        {
             // 默认文字样式
             self.shInputView.textView.typingAttributes = SHInputViewModel.titleAttributes() as! [NSAttributedString.Key : Any]
         }
+    }
     
     // MARK: 设置控件位置
     func setUpSubviewsLocation()

ShorthandMaster/Input/ViewModel/SHInputViewModel.swift

@@ -96,9 +96,9 @@ class SHInputViewModel: NSObject {
                     let imageData : Data = (imageAttachment.image?.jpegData(compressionQuality: 1.0))!
                     
                     // 保存的本地路径
-                    let imagePath = filePath + "/" + "image.jpeg" + imagesPathArray.count.string
+                    let imagePath = "/" + subFile + time + "/" + "image.jpeg" + imagesPathArray.count.string
                     
-                    let imageUrl : URL = URL(fileURLWithPath: imagePath)
+                    let imageUrl : URL = URL(fileURLWithPath: DocumentPath + imagePath)
                     
                     var saveSucceed : Bool = Bool(true)