Merge branch 'develop' into duyu

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift

@@ -139,6 +139,11 @@ class YHHomeViewController: YHBaseViewController {
         
         //2.网络请求
         requestData()
+        
+        
+        
+        //for test hjl
+//        testModelParse()//for test hjl  添加 数据类型 转换
     }
     
     
@@ -150,6 +155,65 @@ class YHHomeViewController: YHBaseViewController {
 // MARK: - 私有方法
 extension YHHomeViewController {
     
+    func testModelParse() {
+        
+//        SmartConfig.debugMode = .verbose
+        
+        let json = """
+        {
+            "data": "balabala Team",
+            "errorCode": 0,
+            "errorMessage": "操作成功",
+            "success":true,
+            "test": {
+                "test1": "test1-value",
+                "test2": "test2-value",
+                "test333": "test3-value",
+            },
+            "testArr":[
+                {
+                    "test1": "test1-value",
+                    "test2": "test2-value",
+                    "test333": "test3-value",
+                },
+                {
+                    "test1": "test1-value",
+                    "test2": "test2-value",
+                    "test333": "test3-value",
+                },
+                {
+                    "test1": "test1-value",
+                    "test2": "test2-value",
+                    "test333": "test3-value",
+                }
+            ]
+        }
+        """
+        
+        
+        //1. json字符串 转 对象
+        guard let model = NetBaseModel.deserialize(json: json) else { return }
+        print("model 是 ==>",model)
+        print(model)
+        
+        //2. 对象 转 dictionary
+        let dic = model.toDictionary()
+        print("dic 是 ==>",dic as Any)
+        
+        //3. dictionary 转 string
+        let jsonString = dic?.jsonString()
+        print("jsonString 是 ==>",jsonString ?? "")
+        
+        //4.model 转 string
+        let jsonString2 = model.toJSONString()
+        print("jsonString2 是 ==>",jsonString2 ?? "")
+        
+        //5. dic 转 model
+        guard let model1 = NetBaseModel.deserialize(dict: dic) else { return }
+        print("model1 是 ==>",model1)
+        
+    }
+    
     @objc func leaveTopOp() {
         canScroll = true
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -32,14 +32,15 @@ class YHInformationPerfectListVC: YHBaseViewController {
     
     private lazy var headerTitleDesLable : UILabel = {
         let titleLable = UILabel(text: "您好,黄先生")
-        titleLable.font = UIFont.PFSC_M(ofSize: 21)
+        titleLable.font = UIFont.PFSC_B(ofSize: 21)
+        titleLable.textColor = UIColor.mainTextColor
         return titleLable
     }()
     
     
     private lazy var topBkg : UIView = {
         let imagV = UIImageView()
-        imagV.image = UIImage(named: "service_center_head_bkg")
+        imagV.image = UIImage(named: "service_center_head_bkg2")
         imagV.contentMode = .scaleAspectFill
         return imagV
         
@@ -169,7 +170,7 @@ extension YHInformationPerfectListVC {
         view.addSubview(topBkg)
         topBkg.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
-            make.height.equalTo(216)
+            make.height.equalTo(259)
         }
         
         
@@ -272,6 +273,7 @@ extension YHInformationPerfectListVC {
         let desLable = UILabel(text: "此表由主申请人填写，我们将会根据您的个人信息制作资料清单，请按顺序填写，提交后1-2个工作日内联系您哦~")
         desLable.font = UIFont.PFSC_R(ofSize: 12)
         desLable.numberOfLines = 0
+        desLable.textColor = UIColor.mainTextColor
         desLable.lineBreakMode = .byWordWrapping
         
         myHeadView.addSubview(desLable)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHInformationPerfectModel.swift

@@ -48,7 +48,7 @@ class YHInformationPerfectModel {
         didSet {
             status = isFinished ? "已完成" : "待完善"
             color = isFinished ? UIColor(hex: 0x222222, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
-            statusColor = isFinished ? UIColor(hex: 0x3ECDC3, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            statusColor = isFinished ? UIColor.successColor : UIColor.labelTextColor2
             if type != 1 {
                 icon = isFinished ? icon : (icon + "_grey")
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractMainItemStatusCell.swift

@@ -47,7 +47,7 @@ class YHContractMainItemStatusCell: UITableViewCell {
     private lazy var itemNameLable : UILabel = {
         let lable = UILabel()
         lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
-        lable.font = UIFont(name: "PingFangSC-Medium", size: 17)
+        lable.font = UIFont.PFSC_M(ofSize: 17)
         lable.text = "信息完善"
         return lable
     }()
@@ -71,22 +71,33 @@ class YHContractMainItemStatusCell: UITableViewCell {
         return view
     }()
     
-    
-    
     private lazy var gofinishHoldView : UIView = {
         let view = UIView()
         return view
     }()
     
+    
+    private var myNextImgV : UIImageView!
 }
 
 extension YHContractMainItemStatusCell {
     func updateUI() {
+        gofinishHoldView.isHidden = true
+        goUnfinishHoldView.isHidden = true
+        myNextImgV.isHidden = true
+        
+        
         iconImageV.image = UIImage(named: dataModel?.iconName ?? "")
         itemNameLable.text = dataModel?.itemName ?? ""
-        
-        gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
-        goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
+        if dataModel?.type == 1 {
+            gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
+            goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
+        } else if dataModel?.type == 2 {
+            gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
+            goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
+        } else if dataModel?.type == 3 {
+            myNextImgV.isHidden = false
+        }
     }
     
     func setupUI() {
@@ -176,6 +187,18 @@ extension YHContractMainItemStatusCell {
             make.right.equalTo(statusLable.snp.left).offset(-4)
             make.width.height.equalTo(14)
         }
+        
+        
+        
+        myNextImgV = UIImageView()
+        myNextImgV.image = UIImage(named: "service_center_right_next_icon")
+        myNextImgV.contentMode = .scaleAspectFill
+        holdView.addSubview(myNextImgV)
+        myNextImgV.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-kMargin)
+            make.width.height.equalTo(20)
+        }
     }
     
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationPerfectCell.swift

@@ -54,8 +54,8 @@ class YHInformationPerfectCell: UITableViewCell {
     
     private lazy var itemNameLable : UILabel = {
         let lable = UILabel()
-        lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
-        lable.font = UIFont(name: "PingFangSC-Medium", size: 17)
+        lable.textColor = UIColor.mainTextColor
+        lable.font = UIFont.PFSC_M(ofSize: 16)
         lable.text = "主申请人信息"
         return lable
     }()
@@ -63,8 +63,8 @@ class YHInformationPerfectCell: UITableViewCell {
     
     private lazy var itemStatusLable : UILabel = {
         let lable = UILabel()
-        lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
-        lable.font = UIFont(name: "PingFangSC-Medium", size: 17)
+        lable.textColor = UIColor.successColor
+        lable.font = UIFont.PFSC_M(ofSize: 14)
         lable.text = "已完成"
         lable.textAlignment = .right
         return lable

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -93,7 +93,10 @@ class YHNetRequest: NSObject {
         print("sign = \(sign)")
         
         requestHeader.add(name:"sign",value:sign)
-        requestHeader.add(name: "token", value: "eyJpdiI6InkrcVNJK2tyMDMzekZOcHE1NklOUUE9PSIsInZhbHVlIjoiRTNMY0VoM2p1b2JvMVoxY28wa2RCRWtMdzA3N1BIaUhqN2F5d3Y5VXp6KzhlNHpTMzdWODlJckNaeUczZkNNamZDbWY0U1c2VGJJOVVBeVpDWUVqV29ISzRkNzh3d2ZZbDFKMk9vN3pRR0g4ZUlXTTliWTNoUzdyNHpQNGtKU1Z3YzMzTnRUMERPQXcwTmpEcXQzSU5qRWt6MlhMWXVEUDB5THNwTWMzZTE1cEtUOUFpXC9xTlB4UFBmeXJ6cHhnNkR6TktFK3hhejJ0OG82cWFGRG5hMkN1dU1zblwvRk8xSEhXTno4Z3Z1WjExYXRHNE1zZXo4Yzh5cW1WSjlNVnBJU1dFOUFYbDBIXC83Q1BtZ3dhK2REa3NFQjI1ODZJalY3U1c0WHM5aG0xSDNzUjJcL0ZPVEhqR1lRTFI3UjBJRVFcL0NRZVlrbWZ4eGJvNUxtZDNJNUdGME45WkwzN1Byc1U5MTdod3RNMFc3TEt5cVNha211aEN6V0g4eFo4YStOYVFYdXhYaTJ6RFN0bTRkb1U3NUV1ZG01XC9UM3pMdlhRSm1VNUpcL0ZwMnpXdkR5XC9hTDJrVW9pamxYRTROOENRSTRsUlVJQ1lGR1phSmJZVVVEK1R6NTZLbkN4WlA5REJhbzN5Qzc4bEE3OTEyTDBJSmZic2dKSkpPWXpaOVF0T1NId05GdGVCYnNBNXVmOWt6MG9GUjRHcEFKVWVJSG1QXC8rTElxZGFTUERlQjdDS1FzUVI2VHJSYXVlZWZ3ZUlVK28rM1VaeGhPXC9OVWFoU0lqUHFkRWdiSG8wcUlcL2IyNWVZUzZ2ZE93ZmZkQXFYXC9CSHJNU0VcL1RPb2RYWW1OVnFhd251UFhjTnI3b2lraVJWcG16SkxRdjFnc1BlaHVTSEdpSTlUMmlBTjF5eFgyb09GSzR6UUdmRHlMZFZNT3JTNmowWGdYNVR5WFM5TnVVNTVYdHduWnV0ZTVNUGNHNngyVGNtK0Q3YTN0ekVZb1E3UFBJd2hmblJEdmZLdk5nUExmaWJJU2hWRVBmdHMzRUM0SW1hTnNSRWt6VWY5NDhodUJJelZvSDNHbjBJMitvb2ZKNGVKMW05SjQ4QVcyTGVtY1JDK2doWE52Kzh6K2xqMVpMWXgxT1NUWUo0UWdocktxbFBxMGx1S0RlbXlJalwvNkhRWUV5dktRcGoxZ3MzT1NWWDN5TGpJQ0hlb1Jta05zdmRpTmdWOXNBYXJidVFnTTlSRG4wUjhEMXg3WWdXUkZSM0JiTlNVaDlBYjZEVFBxdm1lZkw4UGpjRXJMSlVQRFwvNG5zYmp3cVc4emd5bmI4VGU4dW1kS3RhdHhpMGY3NzVKRnVBVjhoVjBHc2VhRmZpS3V4aEdZZFpob3NcLzR1MHpCOUp4ZE92NkZoYU8xc3JuMVdQQjl0QmdoOENCVHZneG1xVFJ1eHVOSVIzN2xnNEVNZ01yeFhzMitESVM0QzdVTmJiUmNkaW1XS2VuR3lqclJNRWk4WmNjK0FyZXh2Qldxd25EU1h1MHE4WElPMnZtSVhQNHBYV1l4QXlKV0dBaUlGem5aMUFGNDFBTmgrMHNIeFVSTWtKUERxQkJvOFJ1anI1SGJZd2hJM1NWbFJnMXdSTUJKMytKeThucDlERVBrK3lkVUVnY1diRkRRXC90aEl2OCtyTFVaQjZcLzlnN01TaXcrVlF0TFVFdGNLbitrVU1WZnlobkVuQXZYSCtqc083cUNXYlRjS21sVDd4ak5FMDlMM05WeHMya3FBblYyVXRNSjI4MklXSmdaUnZqdGxOWTZXS1ZYNXpobTlPWGN0alwvODhoVzM4OEJDeDl3WmZrcGREYnJwbUVRaWdXb2dzMnVcL1ZEYXVxUUtjR1I2WjJuVHNidmlZUHBqREg3bmcyalB2QWdBdz09IiwibWFjIjoiYWYyZTgyMWJkZmUxYzUxOThmYjBiYTI3ZGRhNTk3NWU2NTBlODgzMjZjYmExYzEzZDEwZDA4NGU5YmUzNmIwNiJ9")
+
+        
+        requestHeader.add(name: "token", value: "eyJpdiI6Im1JQWdZRml3QUdoYjVucVRkanE0XC9BPT0iLCJ2YWx1ZSI6ImRlVHdXV3BWTFBvYkdzR0Q5V2JcL0NuNEVyT21HVE9RUFg4MTM0Z2hUTDFTMU00bWpXYnBjR2ZwaTlsWGJtXC9tNnpTaElHUnpQVGhBXC9yRVwvZjJzcERGdWVkT1ducWYrc01FYlFpRW9pMFBzVWVtZTRDUklnTVBKT0RCOGpwa3lJaFVpUmtnK2pYTUZLUEdrSWZLUDE2dWFFdFBLSWR4QzhTamE3MnR2NWl0Qm9nNkg2OTg5UnJrYkFabEt2akNhak1RYzFldFwvamRsUGtha0tcL082R1YwajNHK29ZTUlxeVRzWVlsNG5QZmVPc3RGN0pmTTBOSW9qZHR3YUdEWERqZmljZ0Q5SUFmNVwvQ1BueXY4XC9BVU82c1h1OTNxUUFBaEdGNjQwUWxYWW5xQ0FENnZCb05qQnoxaFcxUk15Y3NuQjRBajJtQ2c4Vk44QTR4ZWE1UDR0MFFnRG5rN09ielpxQnNyZE9oMjJZWE1LOXVUUXpmOFhqNytRRXB5OVg5VnVOcVdqRCtCQnFOd1BLR0lkbUpWdGF2MHRkbUplaGdRU3hhbkNCK0wwbEF1a2VCYm5YSHd3SnF1OUhQRXpqbEZGeHBFNHRtcFV0T3NQVlVMR2phMitPbGQ0Wm01WUtJcDAxM3JQck9xUVpUTW5uQnMxQVVDVXU0S0hLUWVTNHlES01rUk51SGREWUlcL2tiQlIraExldUhmMGFDNmxyNzFkamJFOG11VVFYTTdpU3d0aG85S21ac0V2RDRTcXRYMFE1QVVVQTkraitFU05GWllUTWdKdDh1cWE4VWZ1OVZkZmt5d2RrTzg4Z3pidkRkclwva0EzTG9TejdsUWtOc2Myb1M0MEhxVnJSZnJ1UmtCRHB0Sk1SQm5DMDB0akdEZGpsM1RHWnhiXC94aTA5bExxNDB2cGJBTFVoMWd0MjUxTjA2aUQ0MXRsNm5jWEJFUXVVRGxKRytQc3docE9EUkd0VXdnM3kwcUs1NnJraUFLOWRnQ1h2TVRHM2NxeGF3ZGZGV2UwbktkUkhTV0J1TUlzQWdqQm1sOTY3Sm9Nem1FM2hVM3BJUnpZNWlYT0dQZmliV1JiSkRZQWdOTjZuQ3M5N3FwTGZobGtaaWlNSytoRGVyVnVTWUxuWVprM2UzazRVYmMrVmM1dTk4OUNtbmxTMHF1dXlJdXJSVWFhWTRibU9jVDZrQU9GT2kyN25YM3ZnZTE0SzR6ZzZVMEFOcE5cL2I2ZUNXbDN5RElQQ2VcLytDeUk1YkdFaUhFUzNpQlpOdm9ob2JsZ1hpbHZHOE12Y2U3WmxkbEJrM2kybmxjOWJSQVJHMXlTTWM1Z1d0V0RCV0FjVWlKbjJBbmEwMG91K05iVHlCRGRGWTZ3VFd4cnJFcnZhSTNaNnh1NHphcnlUV1lIZnRVOXRsSDJTVmtqUDNMb1BSck4yUVhNYnE2bVBHamFlWmNiXC9LVGFKU3JGU1pcL2ZYTmxabGROb01jRTR3MWlcL3lCQkhZR1RUTnFHVlk4ZjhuclhlTzdaTEs5QlNVRlVnV01cL2NyTm1DeEx2eDR0YXZsS29OMXpGNlNYWEVpcHlSUERDR3RrcjJUcVM2MlJ5S3RKMHRacFU3RHNrdXI2WThoYlBqWnBGdUx2czRsdU1uXC82dTE5Q05vVUJqTmpoZVB4bVwvSUcwR2R3MGNPK21UT0ZJQUhrbDFLWURZV3ZIS2QrU3ZqSk1jU2FBZTZuakZFTDJJSjlvYm02Z2gzQlA3dTQ3bXFTY0ZBN0NqV2p0ODFvbm9WM01rWXNtaEZXemp3NjVZQW1vVk5obEZkU29lUExOMmhicEJ1XC9PSkU2Z2RiclNRMFoxaGh1UEQ0ZnptQUtSaHdnZEtQZFlMaHpQQXJsbTdcL2NxWUpqSlk4b24raFNtVVN6QXZBPT0iLCJtYWMiOiIyNWNhMGExY2VkYWUyNjcxOGVjOWRhYjdjYzA2Y2EwZTMxYzUxZjEzYjBkNzEyMzVkZDgxNTRiODNkMDRiNTRhIn0=")
+
         headers = requestHeader
     }
     

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/login_tip_icon.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 3119.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 3119@2x.png",
+      "filename" : "未授权不可查看@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 3119@3x.png",
+      "filename" : "未授权不可查看@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_head_bkg2.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "填写列表头图@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "填写列表头图@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_no_data.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 3098.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 3098@2x.png",
+      "filename" : "更多内容敬请期待@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 3098@3x.png",
+      "filename" : "更多内容敬请期待@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_wdpf_icon.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 3380.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_xxws_icon.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 3379.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_zlsc_icon.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 3381.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/submit_success_bkg.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Rectangle 2519.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Rectangle 2519@2x.png",
+      "filename" : "提交成功弹窗头图@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Rectangle 2519@3x.png",
+      "filename" : "提交成功弹窗头图@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }