提交空白占位图

liushiyu
1 parent 116cc992
Showing 14 changed files with 157 additions and 85 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Common/Util/CNLiveCommonJsonUtil.swift → metaCode/Classes/Extensions/NSObject+CNLiveJSONTool.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInfoViewController.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_white_back.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_white_back.imageset/mine_info_header_icon_white_back@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_icon_white_back.imageset/mine_info_header_icon_white_back@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_list_source_empty.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_list_source_empty.imageset/mine_list_source_empty@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_list_source_empty.imageset/mine_list_source_empty@3x.png
@@ -25,6 +25,8 @@ target &#39;metaCode&#39; do
   pod 'SnapKit'
   #加载框
   pod 'MBProgressHUD'
+  #空白占位
+  pod 'DZNEmptyDataSet'
   #模型转换工具
   pod 'HandyJSON'
   #图片视频选择器
@@ -23,7 +23,6 @@
 		79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */; };
 		79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */; };
 		79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */; };
-		792E57D72A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57D62A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift */; };
 		792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */; };
 		792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */; };
 		79396EED2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */; };
@@ -44,6 +43,7 @@
 		798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */; };
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
+		79BDDCBE2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
 		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
@@ -114,7 +114,6 @@
 		79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigUserInfo.swift; sourceTree = "<group>"; };
 		79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginAuthView.swift; sourceTree = "<group>"; };
 		79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewController.swift; sourceTree = "<group>"; };
-		792E57D62A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonJsonUtil.swift; sourceTree = "<group>"; };
 		792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonBaseModel.swift; sourceTree = "<group>"; };
 		792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveCommonQiniuTool.swift; sourceTree = "<group>"; };
 		79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveCurrentVC.swift"; sourceTree = "<group>"; };
@@ -134,6 +133,7 @@
 		798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTypeFeedBackViewController.swift; sourceTree = "<group>"; };
 		798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInputFeedBackViewController.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
+		79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveJSONTool.swift"; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
 		79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
@@ -225,6 +225,7 @@
 				79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
 				798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */,
 				79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */,
+				79BDDCBD2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -300,7 +301,6 @@
 		792E57D52A3AA28E005834DB /* Util */ = {
 			isa = PBXGroup;
 			children = (
-				792E57D62A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift */,
 				792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */,
 				792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */,
 			);
@@ -815,8 +815,8 @@
 				7CD675522A29C04B008354C1 /* CNLiveConstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
-				7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */,
-				7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */,
+				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
+				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
 				792E57D92A3AA2F2005834DB /* CNLiveCommonBaseModel.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNUpSlideView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNDownSlideView.swift in Sources */,
@@ -829,7 +829,7 @@
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
-				792E57D72A3AA2AC005834DB /* CNLiveCommonJsonUtil.swift in Sources */,
+				79BDDCBE2A3C3FC8008560FC /* NSObject+CNLiveJSONTool.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
@@ -101,7 +101,7 @@ class UserInfoManager: NSObject {
             print("获取用户信息失败")
             return UserInfoModel()
         }
-        let userInfo = JsonUtil.jsonToModel(user_info as! String, UserInfoModel.self) as! UserInfoModel
+        let userInfo = jsonToModel(user_info as! String, UserInfoModel.self) as! UserInfoModel
         UserInfoManager.shared._userInfo = userInfo
         return userInfo
     }
 //
-//  CNLiveCommonJsonUtil.swift
+//  NSObject+CNLiveJSONTool.swift
 //  metaCode
 //
-//  Created by open on 2023/6/15.
+//  Created by open on 2023/6/16.
 //
 import Foundation
-
-import UIKit
 import HandyJSON
-class JsonUtil: NSObject {
-        /**
-         *  Json转对象
-         */
-        static func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -> BaseModel {
-            if jsonStr == "" || jsonStr.count == 0 {
-                #if DEBUG
-                    print("jsonoModel:字符串为空")
-                #endif
-                return BaseModel()
-            }
-            return modelType.deserialize(from: jsonStr)  as! BaseModel
-
-        }
-
-        /**
-         *  Json转数组对象
-         */
-        static func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
-            if jsonArrayStr == "" || jsonArrayStr.count == 0 {
-                #if DEBUG
-                    print("jsonToModelArray:字符串为空")
-                #endif
-                return []
-            }
-            var modelArray:[BaseModel] = []
-            let data = jsonArrayStr.data(using: String.Encoding.utf8)
-            let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
-            for people in peoplesArray! {
-                modelArray.append(dictionaryToModel(people as! [String : Any], modelType))
-            }
-            return modelArray
+/**
+ *  Json转对象
+ */
+func jsonToModel(_ jsonStr:String,_ modelType:HandyJSON.Type) -> BaseModel {
+    if jsonStr == "" || jsonStr.count == 0 {
+        #if DEBUG
+            print("jsonoModel:字符串为空")
+        #endif
+        return BaseModel()
+    }
+    return modelType.deserialize(from: jsonStr)  as! BaseModel
+}
-        }
+/**
+ *  Json转数组对象
+ */
+func jsonArrayToModel(_ jsonArrayStr:String, _ modelType:HandyJSON.Type) ->[BaseModel] {
+    if jsonArrayStr == "" || jsonArrayStr.count == 0 {
+        #if DEBUG
+            print("jsonToModelArray:字符串为空")
+        #endif
+        return []
+    }
+    var modelArray:[BaseModel] = []
+    let data = jsonArrayStr.data(using: String.Encoding.utf8)
+    let peoplesArray = try! JSONSerialization.jsonObject(with:data!, options: JSONSerialization.ReadingOptions()) as? [AnyObject]
+    for people in peoplesArray! {
+        modelArray.append(dictionaryToModel(people as! [String : Any], modelType))
+    }
+    return modelArray
-        /**
-         *  字典转对象
-         */
-        static func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type) -> BaseModel {
-            if dictionStr.count == 0 {
-                #if DEBUG
-                    print("dictionaryToModel:字符串为空")
-                #endif
-                return BaseModel()
-            }
-            return modelType.deserialize(from: dictionStr) as! BaseModel
-        }
+}
+/**
+ *  字典转对象
+ */
+func dictionaryToModel(_ dictionStr:[String:Any],_ modelType:HandyJSON.Type) -> BaseModel {
+    if dictionStr.count == 0 {
+        #if DEBUG
+            print("dictionaryToModel:字符串为空")
+        #endif
+        return BaseModel()
+    }
+    return modelType.deserialize(from: dictionStr) as! BaseModel
+}
-        /**
-         *  对象转JSON
-         */
-        static func modelToJson(_ model:BaseModel?) -> String {
-            if model == nil {
-                #if DEBUG
-                    print("modelToJson:model为空")
-                #endif
-                 return ""
-            }
-            return (model?.toJSONString())!
-        }
+/**
+ *  对象转JSON
+ */
+func modelToJson(_ model:BaseModel?) -> String {
+    if model == nil {
+        #if DEBUG
+            print("modelToJson:model为空")
+        #endif
+         return ""
+    }
+    return (model?.toJSONString())!
+}
-        /**
-         *  对象转字典
-         */
-        static func modelToDictionary(_ model:BaseModel?) -> [String:Any] {
-            if model == nil {
-                #if DEBUG
-                    print("modelToJson:model为空")
-                #endif
-                return [:]
-            }
-            return (model?.toJSON())!
-        }
+/**
+ *  对象转字典
+ */
+func modelToDictionary(_ model:BaseModel?) -> [String:Any] {
+    if model == nil {
+        #if DEBUG
+            print("modelToJson:model为空")
+        #endif
+        return [:]
+    }
+    return (model?.toJSON())!
 }
@@ -91,7 +91,7 @@ class CNLiveLoginViewModel : NSObject {
                     if resp.allKeys.contains(where: { item in
                         return item as! String == "data"
                     }) {
-                        let userInfoModel = JsonUtil.dictionaryToModel(resp["data"] as! [String : Any], UserInfoModel.self)
+                        let userInfoModel = dictionaryToModel(resp["data"] as! [String : Any], UserInfoModel.self)
                         UserInfoManager.cacheUserInfo(userInfo: userInfoModel as! UserInfoModel)
                         UserDefaults.standard.set(true,forKey: "is_login")
                         resultBlock()
@@ -61,6 +61,8 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     lazy var photoView: MinePhotoUploadView = {
         let pView = MinePhotoUploadView.init(frame: .zero) { [self] index in
             let mString = NSMutableAttributedString(string: "上传截图 (选填 \(index)/3)")
+            mString.addAttributes([.foregroundColor: UIColor.black,.font: BoldFont_18], range: NSRange(location: 0, length: 4))
+            mString.addAttributes([.foregroundColor: HexColor("#B4B4B4")!,.font: Font_14], range: NSRange(location: 4, length: 9))
             photoLabel.attributedText = mString
         }
         pView.backgroundColor = .clear
@@ -6,6 +6,7 @@
 //
 import Foundation
+import DZNEmptyDataSet
 enum CNLiveMineInfoShowType {
     case add//添加身份
@@ -13,7 +14,7 @@ enum CNLiveMineInfoShowType {
     case message//消息中心
 }
-class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, UITableViewDragDelegate, UITableViewDropDelegate {
+class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, UITableViewDragDelegate, UITableViewDropDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate{
     let kCNLiveMineInfoLListTableViewIdentifier = "kCNLiveMineInfoLListTableViewIdentifier"
     let kCNLiveMineStandInfoTableViewIdentifier = "kCNLiveMineStandInfoTableViewIdentifier"
@@ -23,6 +24,8 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         tableView.dataSource = self
         tableView.dragDelegate = self
         tableView.dropDelegate = self
+        tableView.emptyDataSetSource = self
+        tableView.emptyDataSetDelegate = self
         tableView.backgroundColor = HexColor("#F7F8FA")
         tableView.tableFooterView = UIView.init()
         tableView.rowHeight = 100
@@ -44,8 +47,8 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
             dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份","number":"证件编号：410800111127954"])
         }
         if _show_type == .message {
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者云","number":"志愿者大礼包发放中，快来领取吧！","time":"03-12"])
-            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者·志愿云","number":"志愿者大礼包快来领取吧～","time":"03-12"])
+//            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者云","number":"志愿者大礼包发放中，快来领取吧！","time":"03-12"])
+//            dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者·志愿云","number":"志愿者大礼包快来领取吧～","time":"03-12"])
         }
         return dataArray
     }()
@@ -113,6 +116,28 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
 }
 extension CNLiveMineAddInfoViewController {
+    func image(forEmptyDataSet scrollView: UIScrollView!) -> UIImage! {
+        return UIImage(named: "mine_list_source_empty")
+    }
+    
+    func title(forEmptyDataSet scrollView: UIScrollView!) -> NSAttributedString! {
+        var defult_string = ""
+        switch _show_type {
+        case .add:
+            defult_string = "暂时没有可添加的身份～"
+        case .info:
+            defult_string = "暂时没有身份信息～"
+        case .message:
+            defult_string = "暂时没有可读的消息～"
+        case .none:
+            break
+        }
+        return NSAttributedString(string: defult_string, attributes: [.font: Font_17,.foregroundColor: HexColor("#666666")!])
+    }
+    
+}
+
+extension CNLiveMineAddInfoViewController {
     func numberOfSections(in tableView: UITableView) -> Int {
         return 1
@@ -72,6 +72,12 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
         super.viewDidLoad()
         view.backgroundColor = .black
         setNeedsStatusBarAppearanceUpdate()
+        navigationBarHidden = false
+        topNavView.backgroundColor = .clear
+        //先设置一个默认返回按钮
+        let leftBtn_array : Array<UIButton> = [UIButton.backItem(imageName: "mine_header_icon_white_back", target: self, action: #selector(changeCancelAction))]
+        leftNavBtns = leftBtn_array
+        
         view.addSubview(imageView)
         imageView.snp.makeConstraints { make in
@@ -109,7 +115,6 @@ class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControl
     }
     override var preferredStatusBarStyle: UIStatusBarStyle {
-    
         return .lightContent
     }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_info_header_icon_white_back@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_info_header_icon_white_back@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_source_empty@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_source_empty@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}