字典修改成model

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -257,6 +257,7 @@
 		E0DDCB19244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DDCB17244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib */; };
 		E0DDCB1D244AE81800DF54C7 /* GuanLianKeHuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0DDCB1B244AE81800DF54C7 /* GuanLianKeHuCell.swift */; };
 		E0DDCB1E244AE81800DF54C7 /* GuanLianKeHuCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0DDCB1C244AE81800DF54C7 /* GuanLianKeHuCell.xib */; };
+		E0E8ABFD246E359700E3BB54 /* GuiGeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */; };
 		E0F1BE382469220D003015B2 /* RongSticker.bundle in Resources */ = {isa = PBXBuildFile; fileRef = E0F1BE2A24692208003015B2 /* RongSticker.bundle */; };
 		E0F1BE392469220D003015B2 /* RCColor.plist in Resources */ = {isa = PBXBuildFile; fileRef = E0F1BE2B24692208003015B2 /* RCColor.plist */; };
 		E0F1BE3A2469220D003015B2 /* libvo-amrwbenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E0F1BE2C24692208003015B2 /* libvo-amrwbenc.a */; };
@@ -737,6 +738,7 @@
 		E0DDCB17244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XiuGaiYuShouJiaViewController.xib; sourceTree = "<group>"; };
 		E0DDCB1B244AE81800DF54C7 /* GuanLianKeHuCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuanLianKeHuCell.swift; sourceTree = "<group>"; };
 		E0DDCB1C244AE81800DF54C7 /* GuanLianKeHuCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GuanLianKeHuCell.xib; sourceTree = "<group>"; };
+		E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuiGeModel.swift; sourceTree = "<group>"; };
 		E0F1BE2A24692208003015B2 /* RongSticker.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = RongSticker.bundle; sourceTree = "<group>"; };
 		E0F1BE2B24692208003015B2 /* RCColor.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RCColor.plist; sourceTree = "<group>"; };
 		E0F1BE2C24692208003015B2 /* libvo-amrwbenc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libvo-amrwbenc.a"; sourceTree = "<group>"; };
@@ -1247,6 +1249,7 @@
 		E0336DD2244EC3CA00380BE9 /* 新增规格 */ = {
 			isa = PBXGroup;
 			children = (
+				E0E8ABFC246E359700E3BB54 /* GuiGeModel.swift */,
 				E0336DD3244EC40000380BE9 /* CreatNewSpecsViewController.swift */,
 				E0336DD4244EC40000380BE9 /* CreatNewSpecsViewController.xib */,
 				E0C4F4B3244EE9EE00CC7E2F /* YuShouCell.swift */,
@@ -2656,6 +2659,7 @@
 				E09F4CA22452D18800BE033D /* ZengZhiServicesViewController.swift in Sources */,
 				F94A315B24628C7E00FEC38E /* WorkItemTableViewCell.swift in Sources */,
 				E0DDCB18244AE2AC00DF54C7 /* XiuGaiYuShouJiaViewController.swift in Sources */,
+				E0E8ABFD246E359700E3BB54 /* GuiGeModel.swift in Sources */,
 				F950FDEA2451920200C40530 /* DIYCalendarCell.swift in Sources */,
 				F950FDE224518B9500C40530 /* FSCalendarCalculator.m in Sources */,
 				E0D197C12448431C002B080C /* BabyToy.m in Sources */,

GeliBusinessPlatform/View/Cell/AddImgCell.swift

@@ -7,9 +7,10 @@
 //
 
 import UIKit
-@objc protocol AddImgCellDelegate {
-    @objc optional func AddImgCellBtnClick(cell:AddImgCell)
-    @objc optional func DelImgCellBtnClick(sender:UIButton,cell:AddImgCell)
+protocol AddImgCellDelegate {
+    func AddImgCellBtnClick(cell:AddImgCell)
+    func DelImgCellBtnClick(sender:UIButton,cell:AddImgCell)
+    func ChangeCellBtnClick(sender:UIButton,cell:AddImgCell)
 }
 class AddImgCell: UITableViewCell {
     var delegate:AddImgCellDelegate?
@@ -20,26 +21,27 @@ class AddImgCell: UITableViewCell {
         }
     }
     @IBAction func btnClick(_ sender: Any) {
-        delegate?.AddImgCellBtnClick?(cell: self)
+        delegate?.AddImgCellBtnClick(cell: self)
     }
     var isSingle:Bool?
     
-    var imgs:NSArray?{
+    var imgs:Array<UIImage> = []{
         didSet{
-            if imgs!.count > 0{
+            print(imgs.count)
+            if imgs.count > 0{
                 if scrollView == nil {
-                    let scrView = UIScrollView(frame: CGRect(x: 0, y: nameLbl.frame.maxY, width: fullScreenWidth, height: self.bounds.size.height-nameLbl.frame.maxY))
+                    let scrView = UIScrollView(frame: CGRect(x: addBtn.frame.minX, y: addBtn.frame.minY, width: fullScreenWidth, height: 90))
                     scrView.showsHorizontalScrollIndicator = false
+                    scrView.backgroundColor = UIColor.white
                     self.contentView.addSubview(scrView)
                     scrollView = scrView
                 }
                 scrollView?.isHidden = false
                 
                 if isSingle == true {
-                    addBtn.isHidden = true
-                    setImgUI(arr: imgs!)
+                    setImgUI(arr: imgs)
                 }else{
-                    setImgUI(arr: imgs!)
+                    setImgUI(arr: imgs)
                 }
             }else{
                 scrollView?.isHidden = true
@@ -47,7 +49,7 @@ class AddImgCell: UITableViewCell {
                 if isSingle == true {
                     addBtn.isHidden = false
                 }
-                           
+                
             }
         }
     }
@@ -56,23 +58,24 @@ class AddImgCell: UITableViewCell {
     @IBOutlet weak var nameLbl: UILabel!
     
     @IBOutlet weak var addBtnX: NSLayoutConstraint!
-    func setImgUI(arr:NSArray){
-        let y = nameLbl.frame.maxY
-        let h = self.bounds.size.height-nameLbl.frame.maxY
+    func setImgUI(arr:Array<UIImage>){
+        let y = addBtn.frame.minY
+        let h:CGFloat = 90
         if isSingle == false {
             addBtn.isHidden = false
             scrollView?.isHidden = false
             if arr.count < 3 {
-                scrollView?.frame = CGRect(x: 0, y: CGFloat(y), width: CGFloat(arr.count)*110, height:h)
-                addBtnX.constant =  (scrollView?.frame.maxX)!+10
+                scrollView?.contentSize = CGSize(width: arr.count*105, height: 0)
+                scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: CGFloat(arr.count)*105, height:h)
+                addBtnX.constant =  (scrollView?.frame.maxX)!
             }else if arr.count == 5 {
                 addBtn.isHidden = true
-                scrollView?.contentSize = CGSize(width: arr.count*110, height: 0)
-                scrollView?.frame = CGRect(x: 0, y: CGFloat(y), width: fullScreenWidth, height:h)
+                scrollView?.contentSize = CGSize(width: arr.count*105, height: 0)
+                scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: fullScreenWidth, height:h)
             }else{
-                scrollView?.contentSize = CGSize(width: arr.count*110, height: 0)
-                scrollView?.frame = CGRect(x: 0, y: CGFloat(y), width: fullScreenWidth*0.7, height:h)
-                addBtnX.constant =  (scrollView?.frame.maxX)!+10
+                scrollView?.contentSize = CGSize(width: arr.count*105, height: 0)
+                scrollView?.frame = CGRect(x: 15, y: CGFloat(y), width: fullScreenWidth-130, height:h)
+                addBtnX.constant =  fullScreenWidth-105
             }
         }
         for i in 0 ..< arr.count {
@@ -80,12 +83,31 @@ class AddImgCell: UITableViewCell {
             img.layer.cornerRadius = 3
             img.layer.masksToBounds = true
             scrollView!.addSubview(img)
-            img.image = arr[i] as! UIImage
+            img.image = arr[i]
             img.isUserInteractionEnabled = true
             img.snp.makeConstraints { (make) in
                 make.centerY.equalTo(scrollView!.snp_centerY)
                 make.width.height.equalTo(90)
-                make.left.equalTo(15 + 105*i)
+                make.left.equalTo(105*i)
+            }
+            let changeBtn = UIButton()
+            changeBtn.tag = i
+            changeBtn.backgroundColor = UIColor(named: "标题字颜色")
+            changeBtn.alpha = 0.5
+            changeBtn.addTarget(self, action: #selector(changeAction(sender:)), for: .touchUpInside)
+            img.addSubview(changeBtn)
+            changeBtn.snp.makeConstraints { (make) in
+                make.top.bottom.right.left.equalTo(0)
+            }
+            
+            let ti = UILabel()
+            ti.text = "替 换"
+            ti.textColor = UIColor.white
+            ti.textAlignment = .center
+            ti.font = UIFont.systemFont(ofSize: 15)
+            img.addSubview(ti)
+            ti.snp.makeConstraints { (make) in
+                make.top.bottom.right.left.equalTo(0)
             }
             let delImg = UIImageView()
             img.addSubview(delImg)
@@ -109,8 +131,12 @@ class AddImgCell: UITableViewCell {
             delBtn.addTarget(self, action: #selector(delAction(sender:)), for: .touchUpInside)
         }
     }
+    @objc func changeAction(sender:UIButton){
+        delegate?.ChangeCellBtnClick(sender: sender,cell:self)
+    }
     @objc func delAction(sender:UIButton){
-        delegate?.DelImgCellBtnClick?(sender: sender, cell: self)
+        
+        delegate?.DelImgCellBtnClick(sender:sender, cell: self)
     }
     override func awakeFromNib() {
         super.awakeFromNib()

GeliBusinessPlatform/View/Cell/YuShouWeiKuanFaHuoCell.swift

@@ -7,19 +7,25 @@
 //
 
 import UIKit
-
+protocol YuShouWeiKuanFaHuoCellDelegate {
+    func YuShouWeiKuanFaHuoCellString(str:String)
+}
 class YuShouWeiKuanFaHuoCell: UITableViewCell {
-
+    var delegate:YuShouWeiKuanFaHuoCellDelegate?
     @IBOutlet weak var textTF: UITextField!
     @IBOutlet weak var nameLbl: UILabel!
     
     override func awakeFromNib() {
         super.awakeFromNib()
         self.selectionStyle = .none
-        
+        textTF.addTarget(self, action: #selector(textChange(tf:)), for: .allEditingEvents)
         // Initialization code
     }
-
+    @objc func textChange(tf:UITextField){
+        if tf.text != nil {        
+            delegate?.YuShouWeiKuanFaHuoCellString(str: tf.text!)
+        }
+    }
     override func setSelected(_ selected: Bool, animated: Bool) {
         super.setSelected(selected, animated: animated)
 

GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 import LGButton
 protocol CreatNewSpecsViewControllerDelegate {
-    func CreatNewSpecsViewControllerSaveAction(datas:NSMutableArray)
+    func CreatNewSpecsViewControllerSaveAction(datas:Array<GuiGeModel>)
     func CreatNewSpecsViewControllerDeleteAction()
 }
 class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndTFCellDelegate,TitleAndBtnCellDelegate,TitleAndSwitchCellDelegate,TitleAndSwitchHeaderViewDelegate,NewCreateHeaderDelegate,NewCreateFooterDelegate,YuShouCellDelegate,GLAlertSelectViewDelegate,PuTongJieTiCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout{
@@ -19,9 +19,8 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     
     var delegate:CreatNewSpecsViewControllerDelegate?
     var collectView:UICollectionView?
-    var datasArr:NSMutableArray = []
-    var dataDict:NSDictionary?
-    
+    var datasArr:Array<GuiGeModel> = []
+    var dataModel = GuiGeModel()
     let titleArray = ["售价：","规格：","重量：","温藏：","单位："]
     let pliceHolderArr = ["请输入商品售价","请输入商品规格","请输入商品重量","请选择商品温藏","请选择商品单位"]
     @IBOutlet weak var bottomBtn: LGButton!
@@ -68,16 +67,16 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
             danWei = newValue
         }
     }//规格
-    var specalArr:NSMutableArray = []{
+    var specalArr:Array<Any> = []{
         willSet{
-            specalArr.removeAllObjects()
+            specalArr.removeAll()
             specalArr = newValue
             
         }
     }//预售
-    var jieTiArr:NSMutableArray = []{
+    var jieTiArr:Array<Any> = []{
         willSet{
-            jieTiArr.removeAllObjects()
+            jieTiArr.removeAll()
             jieTiArr = newValue
             
         }
@@ -186,24 +185,26 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
         //            }
         //        }
         
-        let dict = NSMutableDictionary()
-        dict["price"] = price
-        dict["guiGe"] = guiGe
-        dict["weight"] = weight
-        dict["wenDu"] = wenDu
-        dict["danWei"] = danWei
-        dict["jieTiArr"] = jieTiArr
-        dict["specalArr"] = specalArr
-        dict["itemIdx"] = datasArr.count
-        dict["isNonYuShou"] = isNonYuShou
-        dict["isYuShouSetting"] = isYuShouSetting
-        dict["yuShouPrice"] = yuShouPrice
+//        let dict = NSMutableDictionary()
+        dataModel.price = price
+        dataModel.guiGe = guiGe
+        dataModel.weight = weight
+        dataModel.wenDu = wenDu
+        dataModel.danWei = danWei
+        dataModel.jieTiArr = jieTiArr as! Array<Any>
+        dataModel.specalArr = specalArr as! Array<Any>
+        dataModel.isNonYuShou = isNonYuShou
+        dataModel.isYuShouSetting = isYuShouSetting
+        dataModel.yuShouPrice = yuShouPrice
         if barTitle?.contains("编辑") == true {
-            datasArr.replaceObject(at: selectIdx!.item, with: dict)
+//            datasArr.replaceObject(at: selectIdx!.item, with: dict)
+            datasArr.insert(dataModel, at: selectIdx!.item)
+            datasArr.remove(at: selectIdx!.item+1)
+       
         }else{
-            datasArr.add(dict)
+            datasArr.append(dataModel)
         }
-        delegate?.CreatNewSpecsViewControllerSaveAction(datas: datasArr)
+        delegate?.CreatNewSpecsViewControllerSaveAction(datas:datasArr)
         self.navigationController?.popViewController(animated: true)
     }
     //MARK: - cell delegate
@@ -529,29 +530,33 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     }
     
     func footerClickAction() {
+        print(jieTiArr)
         if selectYuShou {//预售
-            specalArr.add("")
+            specalArr.append("")
         }else{//非预售
-            jieTiArr.add("")
+            jieTiArr.append("")
         }
         listTbv.reloadData()
     }
     func YuShouCellSwitchStatus(sender: UISwitch) {
         //控制
-        print("status3 = \(isYuShouSetting) , \(isJieTiJiaSetting)")
         isYuShouSetting = sender.isOn
         listTbv.reloadData()
     }
-    func PuTongJieTiDelAction(sender: UIButton) {
-        jieTiArr.removeObject(at: sender.tag)
-        print(jieTiArr)
+    func PuTongJieTiDelAction(sender: PuTongJieTiCell) {
+        jieTiArr.remove(at: sender.tag)
+        print(jieTiArr,sender.tag)
         listTbv.reloadData()
     }
     func PuTongJieTiContent(price: String, count: String, cell: PuTongJieTiCell) {
         if  selectYuShou {
-            specalArr.replaceObject(at: cell.tag, with: "\(price)_\(count)")
+            specalArr.insert("\(price)_\(count)", at: cell.tag)
+            print(specalArr)
+            specalArr.remove(at: cell.tag+1)
         }else{
-            jieTiArr.replaceObject(at: cell.tag, with: "\(price)_\(count)")
+            jieTiArr.insert("\(price)_\(count)", at: cell.tag)
+            print(jieTiArr)
+            jieTiArr.remove(at: cell.tag+1)
         }
     }
     
@@ -589,19 +594,17 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         selectIdx = indexPath
         //刷新cell
-        let dataDict = datasArr[selectIdx!.item] as! NSDictionary
-        price = dataDict["price"] as! String
-        guiGe = dataDict["guiGe"] as! String
-        weight = dataDict["weight"] as! String
-        wenDu = dataDict["wenDu"] as! String
-        danWei = dataDict["danWei"] as! String
-        let arr = dataDict["jieTiArr"] as! NSMutableArray
-        let arr2 = dataDict["specalArr"] as! NSMutableArray
-        isNonYuShou = dataDict["isNonYuShou"] as! Bool
-        isYuShouSetting = dataDict["isYuShouSetting"] as! Bool
-        yuShouPrice = dataDict["yuShouPrice"] as! String
-        specalArr = arr2
-        jieTiArr = arr
+        let dataDict = datasArr[selectIdx!.item]
+        price = dataDict.price
+        guiGe = dataDict.guiGe
+        weight = dataDict.weight
+        wenDu = dataDict.wenDu
+        danWei = dataDict.danWei
+        isNonYuShou = dataDict.isNonYuShou
+        isYuShouSetting = dataDict.isYuShouSetting
+        yuShouPrice = dataDict.yuShouPrice
+        specalArr = dataDict.specalArr
+        jieTiArr = dataDict.jieTiArr
         listTbv.reloadData()
         collectionView.reloadData()
     }

GeliBusinessPlatform/ViewController/新增规格/GuiGeModel.swift

+//
+//  GuiGeModel.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2020/5/15.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import Foundation
+
+class GuiGeModel: NSObject {
+    ///售价
+    var price : String = ""
+    ///规格
+    var guiGe : String = ""
+    ///重量
+    var weight : String = ""
+    ///温度
+    var wenDu : String = ""
+    ///单位
+    var danWei : String = ""
+     ///是否预售
+    var isNonYuShou : Bool = false
+     ///是否打开预售设置
+    var isYuShouSetting : Bool = false
+     ///预售价格
+    var yuShouPrice : String = ""
+     ///普通阶梯价
+    var jieTiArr : Array<Any> = []
+     ///预售阶梯价
+    var specalArr : Array<Any> = []
+
+}

GeliBusinessPlatform/ViewController/新增规格/PuTongJieTiCell.swift

@@ -8,16 +8,15 @@
 
 import UIKit
 @objc protocol PuTongJieTiCellDelegate {
-    @objc optional func PuTongJieTiDelAction(sender:UIButton)
+    @objc optional func PuTongJieTiDelAction(sender:PuTongJieTiCell)
     @objc optional func PuTongJieTiContent(price:String,count:String,cell:PuTongJieTiCell)
 }
 class PuTongJieTiCell: UITableViewCell {
     var delegate:PuTongJieTiCellDelegate?
     @IBAction func delAction(_ sender: UIButton) {
-        delegate?.PuTongJieTiDelAction?(sender: sender)
+        delegate?.PuTongJieTiDelAction?(sender: self)
     }
     
- 
     @IBOutlet weak var priceTF: UITextField!
     @IBOutlet weak var countTF: UITextField!
     @IBOutlet weak var titleLbl: UILabel!

GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib

@@ -156,7 +156,7 @@
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="标题字颜色">
-            <color red="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色分界线">
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>