店铺分类bug修复

张旭
1 parent f4d34a7a
Showing 3 changed files with 54 additions and 62 deletions
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
@@ -105,8 +105,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     }
     //临时选中一级分类
-    var _temp_selectFirCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel?
-    var temp_selectFirCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel? {
+    var _temp_selectFirCategoryModel :CNLiveShopClassifyModel?
+    var temp_selectFirCategoryModel :CNLiveShopClassifyModel?{
         get{
             _temp_selectFirCategoryModel
         }
@@ -116,7 +116,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else{
                 return
             }
-            if _temp_selectFirCategoryModel?.id ?? 0 > 0{
+            if Int(_temp_selectFirCategoryModel?.id ?? "0")! > 0{
                 self.firCategoryBtn?.setTitle(_temp_selectFirCategoryModel?.title, for: .normal)
             }else{
                 self.firCategoryBtn?.setTitle("请选择", for: .normal)
@@ -124,8 +124,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         }
     }
     //临时选中二级分类
-    var _temp_selectSecCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel?
-    var temp_selectSecCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel? {
+    var _temp_selectSecCategoryModel :CNLiveShopClassifyModel?
+    var temp_selectSecCategoryModel :CNLiveShopClassifyModel?{
         get{
             _temp_selectSecCategoryModel
         }
@@ -135,7 +135,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else{
                 return
             }
-            if _temp_selectSecCategoryModel?.id ?? 0 > 0{
+            if Int(_temp_selectSecCategoryModel?.id ?? "0")! > 0{
                 self.secCategoryBtn?.setTitle(_temp_selectSecCategoryModel?.title, for: .normal)
                 self.secCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
             }else{
@@ -149,8 +149,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         }
     }
     //临时选中三级分类
-    var _temp_selectThiCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel?
-    var temp_selectThiCategoryModel : CNLiveShopGoodsManageDetailsGoodsCategoryModel? {
+    var _temp_selectThiCategoryModel :CNLiveShopClassifyModel?
+    var temp_selectThiCategoryModel :CNLiveShopClassifyModel?{
         get{
             _temp_selectThiCategoryModel
         }
@@ -160,7 +160,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             }else{
                 return
             }
-            if _temp_selectThiCategoryModel!.id > 0{
+            if Int(_temp_selectThiCategoryModel!.id ?? "0")! > 0{
                 self.thiCategoryBtn?.setTitle(_temp_selectThiCategoryModel?.title, for: .normal)
                 self.thiCategoryBtn?.setTitleColor(HexColor("#333333"), for: .normal)
             }else{
@@ -320,7 +320,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             return cell
         }
         if self.displayLevel == 1{
-            let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+            let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+            
             cell.titleLabel.text = model.title
             if model.id == self.temp_selectFirCategoryModel?.id{
                 cell.titleLabel.textColor = HexColor("#FC1541")
@@ -328,7 +329,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                 cell.titleLabel.textColor = HexColor("#666666")
             }
         }else if (self.displayLevel == 2) {
-            let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+            let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+            
             cell.titleLabel.text = model.title
             if model.id == self.temp_selectSecCategoryModel?.id{
                 cell.titleLabel.textColor = HexColor("#FC1541")
@@ -336,7 +338,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                 cell.titleLabel.textColor = HexColor("#666666")
             }
         }else if (self.displayLevel == 3) {
-            let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+            let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
             cell.titleLabel.text = model.title
             if model.id == self.temp_selectThiCategoryModel?.id{
                 cell.titleLabel.textColor = HexColor("#FC1541")
@@ -352,30 +354,29 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if self.categoryType == .goods{
             if self.displayLevel == 1{
-                let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                self.postDataWithPid(pid: String(format: "%d", model.id), level: 2) {
+                let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+                self.postDataWithPid(pid: model.id ?? "", level: 2) {
+//                self.postDataWithPid(pid: String(format: "%d", model.id), level: 2) {
                     self.temp_selectFirCategoryModel = model
                     self.temp_selectSecCategoryModel = nil
                     self.temp_selectThiCategoryModel = nil
                 }
             }else if (self.displayLevel == 2) {
-                let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                self.postDataWithPid(pid: String(format: "%d", model.id), level: 3) {
+                let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
+                self.postDataWithPid(pid: model.id ?? "", level: 3) {
+//                self.postDataWithPid(pid: String(format: "%d", model.id), level: 3) {
                     self.temp_selectSecCategoryModel = model
                     self.temp_selectThiCategoryModel = nil
                 }
             }else if (self.displayLevel == 3) {
-                let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
+                let model = self.thiCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
                 self.temp_selectThiCategoryModel = model
                 self.tableView.reloadData()
             }
         }else if self.categoryType == .shop{
             if (self.displayLevel == 1) {
                 let model = self.firCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
-                let tempFirMdl = CNLiveShopGoodsManageDetailsGoodsCategoryModel()
-                tempFirMdl.id = Int(model.id ?? "0")!
-                tempFirMdl.title = model.title
-                self.temp_selectFirCategoryModel = tempFirMdl
+                self.temp_selectFirCategoryModel = model
                 self.temp_selectSecCategoryModel = nil
                 if (model.child.count == 0) {
                     self.tableView.reloadData()
@@ -386,10 +387,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                 self.tableView.reloadData()
             }else if (self.displayLevel == 2){
                 let model = self.secCategoryDataArr[indexPath.row] as! CNLiveShopClassifyModel
-                let tempFirMdl = CNLiveShopGoodsManageDetailsGoodsCategoryModel()
-                tempFirMdl.id = Int(model.id ?? "0")!
-                tempFirMdl.title = model.title
-                self.temp_selectSecCategoryModel = tempFirMdl
+                self.temp_selectSecCategoryModel = model
                 self.tableView.reloadData()
             }
         }
@@ -411,20 +409,19 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                 showMessage(message: "请选择级分类")
                 return
             }
-            //需要看能不能转成功
-            let classModel = self.temp_selectFirCategoryModel as? CNLiveShopClassifyModel
-            //DSShopClassifyModel *classModel = (DSShopClassifyModel *)self.temp_selectFirCategoryModel;
-            if classModel!.child.count > 0 && self.temp_selectSecCategoryModel == nil{
-                showMessage(message: "未选择二级分类")
-                return
+            if let classModel = self.temp_selectFirCategoryModel{
+                if classModel.child.count > 0 && self.temp_selectSecCategoryModel == nil{
+                    showMessage(message: "未选择二级分类")
+                    return
+                }
             }
         }
-        self.firCategoryId = self.temp_selectFirCategoryModel?.id ?? 0
+        self.firCategoryId = Int(self.temp_selectFirCategoryModel?.id ?? "0")!
         self.firCategoryName = self.temp_selectFirCategoryModel?.title
-        self.secCategoryId = self.temp_selectSecCategoryModel?.id ?? 0
+        self.secCategoryId = Int(self.temp_selectSecCategoryModel?.id ?? "0")!
         self.secCategoryName = self.temp_selectSecCategoryModel?.title
-        self.thiCategoryId = self.temp_selectThiCategoryModel?.id ?? 0
+        self.thiCategoryId = Int(self.temp_selectThiCategoryModel?.id ?? "0")!
         self.thiCategoryName = self.temp_selectThiCategoryModel?.title
         self.finishBlock!()
         self.hide()
@@ -449,8 +446,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     @objc func secCategoryBtnClick(){
         if self.categoryType == .shop{
-            //需要看能不能转成功
-            let model = self.temp_selectFirCategoryModel as? CNLiveShopClassifyModel
+            let model = self.temp_selectFirCategoryModel
             if model?.child.count == 0 {
                 showMessage(message: "该分类暂没有添加子分类")
                 return
@@ -501,7 +497,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             hiddenLoading()
             if status == .success{
-                let dataArr = result as! [CNLiveShopGoodsManageDetailsGoodsCategoryModel]
+                let dataArr = result as! [CNLiveShopClassifyModel]
                 self.displayLevel = level
                 if level == 1{
                     self.firCategoryDataArr = NSMutableArray(array: dataArr)
@@ -513,8 +509,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                         let tempDataArr = Array(self.firCategoryDataArr)
                         for (_,mdl) in tempDataArr.enumerated() {
-                            let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                            if model.id == self.firCategoryId{
+                            let model = mdl as! CNLiveShopClassifyModel
+                            if Int(model.id ?? "0")! == self.firCategoryId{
                                 self.temp_selectFirCategoryModel = model
                                 break
                             }
@@ -528,8 +524,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                     if self.secCategoryId > 0{
                         let tempDataArr = Array(self.thiCategoryDataArr)
                         for (_,mdl) in tempDataArr.enumerated() {
-                            let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                            if model.id == self.secCategoryId{
+                            let model = mdl as! CNLiveShopClassifyModel
+                            if Int(model.id ?? "0")! == self.secCategoryId{
                                 self.temp_selectSecCategoryModel = model
                                 break
                             }
@@ -543,8 +539,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
                     if self.thiCategoryId > 0{
                         let tempDataArr = Array(self.thiCategoryDataArr)
                         for (_,mdl) in tempDataArr.enumerated() {
-                            let model = mdl as! CNLiveShopGoodsManageDetailsGoodsCategoryModel
-                            if model.id == self.thiCategoryId{
+                            let model = mdl as! CNLiveShopClassifyModel
+                            if Int(model.id ?? "0")! == self.thiCategoryId{
                                 self.temp_selectThiCategoryModel = model
                                 break
                             }
@@ -403,7 +403,9 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 }
                 super.frame = CGRect(x: frame.origin.x, y: frame.origin.y, width: frame.size.width, height: height == 0 ? frame.size.height : height)
                 if isNeedCallBack{
-                    self.changeFrameCallBack!()
+                    if (self.changeFrameCallBack?()) != nil{
+                        self.changeFrameCallBack!()
+                    }
                 }
             }else{
                 super.frame = frame
@@ -596,24 +598,27 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
         }
         UIApplication.shared.keyWindow?.endEditing(true)
         if (model.isVideo == true){
+            //视频
             if (model.localVideoUrl != nil){
-                CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL: URL(string: model.videoUrl ?? "")!, coverImage: model.image!, coverImageUrl: nil)
+                CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL:model.localVideoUrl!, coverImage: model.image!, coverImageUrl: nil)
             }else if model.videoUrl?.count ?? 0 > 0{
-                CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL: model.localVideoUrl!, coverImage: nil, coverImageUrl: model.imageUrl)
+                CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL: URL(string: model.videoUrl!)!, coverImage: nil, coverImageUrl: model.imageUrl)
             }else{
                 //TODO:后面再调整具体的配置
                 // 设置与微信主题一致的配置
                 let config = PhotoTools.getWXPickerConfig()
                 config.selectOptions = [.video]
                 config.previewView.bottomView.editButtonHidden = false
+                config.maximumSelectedVideoCount = 1
                 let pickerController = PhotoPickerController(picker: config)
                 pickerController.pickerDelegate = self
                 // 是否选中原图
-                pickerController.isOriginal = true
+                pickerController.isOriginal = false
                 pickerController.modalPresentationStyle = .fullScreen
                 currentViewController()?.present(pickerController, animated: true)
             }
         }else{
+            //图片
             if (model.isSelectPhotoPlaceholder != nil) && (model.isSelectPhotoPlaceholder == true){
                 if self.uploadImageUrls.count >= self.maxSelectImageCount{
                     let message = String(format: "最多只能选取%ld张图片", self.maxSelectImageCount)
@@ -674,20 +679,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
             if (model.imageUrl?.count ?? 0 > 0) && (singleImageView.model?.imageUrl?.count ?? 0 > 0){
                 if model.imageUrl == singleImageView.model?.imageUrl{
-                    if singleImageView.model?.isVideo == true{
-                        //subview是视频
-                        if singleImageView.model?.isUploading == true{
-                            //subview正在上传中
-                            UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
-                        }else{
-                            //subview上传完成
-                            //标记当前有视频,并替换model
-                            self.replaceVideoUrls.append(singleImageView.model!)
-                            let videoModel = CNLiveSelectUploadImageModel()
-                            videoModel.isVideo = true
-                            self.uploadVideoModel = videoModel
-                        }
-                    }else{
+                    if singleImageView.model?.isVideo == false{
                         //subview是纯图片
                         if singleImageView.model?.isUploading == true{
                             //上传中
@@ -705,6 +697,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 }
             }else{
                 //imageUrl有空值
+                //有视频 有图片
                 if model.videoUrl?.count ?? 0 > 0 && self.uploadVideoModel?.videoUrl?.count ?? 0 > 0 && model.videoUrl == self.uploadVideoModel?.videoUrl{
                     //当前要删除的是视频
                     if self.uploadVideoModel?.isVideo == true{
@@ -924,6 +917,8 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                     splitCompleteClosure(isSuccess, splitImages)
                     print("completed")
                 }
+            @unknown default: break
+                
             }
         }
     }
@@ -275,7 +275,8 @@ class CNLiveShopGoodListViewModel:NSObject{
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/cateList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
-                let resp = result as! NSDictionary
+                let respDic = result as! NSDictionary
+                let resp = respDic["data"] as! NSDictionary
                 let listModel = newDictionaryToModel(resp as! [String : Any], CNLiveShopClassifyListModel.self)
                 resultBlock(listModel,.success)
             }else{