添加 首页雷达

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -455,6 +455,10 @@
 		A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
 		A5EE41EF2C21387C005BBA5D /* YHAiRadarAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */; };
+		A5EE42002C216C78005BBA5D /* img_1.png in Resources */ = {isa = PBXBuildFile; fileRef = A5EE41FC2C216C78005BBA5D /* img_1.png */; };
+		A5EE42012C216C78005BBA5D /* img_0.png in Resources */ = {isa = PBXBuildFile; fileRef = A5EE41FD2C216C78005BBA5D /* img_0.png */; };
+		A5EE42022C216C78005BBA5D /* img_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = A5EE41FE2C216C78005BBA5D /* img_2.jpg */; };
+		A5EE42032C216C78005BBA5D /* data.json in Resources */ = {isa = PBXBuildFile; fileRef = A5EE41FF2C216C78005BBA5D /* data.json */; };
 		A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
 		A5EF21332BA6E030005027E6 /* YHFileListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */; };
 		A5EF21352BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */; };
@@ -960,6 +964,10 @@
 		A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
 		A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAiRadarAreaView.swift; sourceTree = "<group>"; };
+		A5EE41FC2C216C78005BBA5D /* img_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = img_1.png; sourceTree = "<group>"; };
+		A5EE41FD2C216C78005BBA5D /* img_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = img_0.png; sourceTree = "<group>"; };
+		A5EE41FE2C216C78005BBA5D /* img_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = img_2.jpg; sourceTree = "<group>"; };
+		A5EE41FF2C216C78005BBA5D /* data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = data.json; sourceTree = "<group>"; };
 		A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
 		A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListViewController.swift; sourceTree = "<group>"; };
 		A5EF21342BA6E05E005027E6 /* YHQuestionAndAnswerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHQuestionAndAnswerViewController.swift; sourceTree = "<group>"; };
@@ -2592,6 +2600,7 @@
 		A5DF3D4A2BF9A304003D5F03 /* jsons */ = {
 			isa = PBXGroup;
 			children = (
+				A5EE41FB2C216C78005BBA5D /* radar */,
 				04EA2E6D2BF74FA200AE80B0 /* shipin.json */,
 				04EA2E6F2BF74FA200AE80B0 /* zixun.json */,
 				04EA2E6E2BF74FA200AE80B0 /* shouye.json */,
@@ -2607,6 +2616,17 @@
 			path = Font;
 			sourceTree = "<group>";
 		};
+		A5EE41FB2C216C78005BBA5D /* radar */ = {
+			isa = PBXGroup;
+			children = (
+				A5EE41FC2C216C78005BBA5D /* img_1.png */,
+				A5EE41FD2C216C78005BBA5D /* img_0.png */,
+				A5EE41FE2C216C78005BBA5D /* img_2.jpg */,
+				A5EE41FF2C216C78005BBA5D /* data.json */,
+			);
+			path = radar;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -2720,18 +2740,22 @@
 				04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */,
 				049663C02BF729F6003C8295 /* galaxy_refresher.gif in Resources */,
 				045EEED42B9F171A0022A143 /* scoreOptionData.plist in Resources */,
+				A5EE42032C216C78005BBA5D /* data.json in Resources */,
 				045EEED62B9F171A0022A143 /* YHQuestionList.plist in Resources */,
 				04EA2E722BF74FA200AE80B0 /* zixun.json in Resources */,
 				A5C5B2EE2B4F9B8800A7C5D1 /* Localizable.xcstrings in Resources */,
 				A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */,
 				A51044182B493675006B60BB /* README.md in Resources */,
+				A5EE42012C216C78005BBA5D /* img_0.png in Resources */,
 				A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */,
 				04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
 				048FA0332BFDDFF400AD3BA9 /* submit_head_animation.gif in Resources */,
 				A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
+				A5EE42022C216C78005BBA5D /* img_2.jpg in Resources */,
 				04EA2E702BF74FA200AE80B0 /* shipin.json in Resources */,
 				044378A42BFC848C001F95AE /* loginBkg.mov in Resources */,
 				047619ED2BA9B9C900F45358 /* area.plist in Resources */,
+				A5EE42002C216C78005BBA5D /* img_1.png in Resources */,
 				048FA0342BFDDFF400AD3BA9 /* submit_page_scroll.gif in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHAiRadarAreaView.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import Lottie
 
 class YHAiRadarAreaView: UIView {
 
@@ -15,6 +16,9 @@ class YHAiRadarAreaView: UIView {
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupUI()
+        
+        let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
+        addGestureRecognizer(tap)
     }
     
     required init?(coder: NSCoder) {
@@ -24,6 +28,7 @@ class YHAiRadarAreaView: UIView {
     lazy var bkgImageV: UIImageView = {
         let imgV : UIImageView = UIImageView()
         imgV.contentMode = .scaleAspectFill
+        imgV.image = UIImage(named: "home_radar_bkg")
         return imgV
     }()
     
@@ -52,56 +57,61 @@ class YHAiRadarAreaView: UIView {
         lable.font = UIFont.PFSC_R(ofSize: 13)
         lable.textColor = UIColor.white
         lable.backgroundColor = UIColor.brandMainColor
+        lable.textAlignment = .center
         return lable
     }()
     
-    
-    
+    lazy var animationView: LottieAnimationView = {
+        let view = LottieAnimationView(name: "data")
+        view.loopMode = .loop
+        view.play()
+        return view
+    }()
 }
 
 extension YHAiRadarAreaView {
-    @objc func didLookOrderBtnClicked() {
+    
+    @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
         goTabBarBy(tabType: .service)
     }
     
     func setupUI() {
+        addSubview(bkgImageV)
+        bkgImageV.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
         
-//        self.backgroundColor = UIColor(hex: 0xF8FAFB)
-//
-//        let imgView = UIImageView(image: UIImage(named: "home_tips_order"))
-//        addSubview(imgView)
-//        imgView.snp.makeConstraints { make in
-//            make.width.height.equalTo(31)
-//            make.centerY.equalToSuperview()
-//            make.left.equalTo(14)
-//        }
-//        
-//        let label = UILabel()
-//        label.textAlignment = .left
-//        let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
-//        let bb: ASAttributedString = .init("1", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor))
-//        let cc: ASAttributedString = .init("个服务中的优才订单", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
-//        label.attributed.text = aa+bb+cc
-//        addSubview(label)
-//        label.snp.makeConstraints { make in
-//            make.centerY.equalToSuperview()
-//            make.left.equalTo(imgView.snp.right).offset(6)
-//        }
-//        
-//        let btn = UIButton()
-//        btn.setTitle("查看进度", for: .normal)
-//        btn.setTitleColor(.white, for: .normal)
-//        btn.backgroundColor = UIColor.brandMainColor
-//        btn.titleLabel?.font = .PFSC_R(ofSize: 12)
-//        btn.addTarget(self, action: #selector(didLookOrderBtnClicked), for: .touchUpInside)
-//        addSubview(btn)
-//        btn.snp.makeConstraints { make in
-//            make.width.equalTo(72)
-//            make.height.equalTo(33)
-//            make.centerY.equalToSuperview()
-//            make.left.equalTo(label.snp.right).offset(16)
-//            make.right.equalTo(-16)
-//        }
-
+        
+        addSubview(animationView)
+        animationView.snp.makeConstraints { make in
+            make.width.height.equalTo(54)
+            make.left.equalTo(20)
+            make.centerY.equalToSuperview()
+        }
+        
+        addSubview(lable1)
+        lable1.snp.makeConstraints { make in
+            make.top.equalTo(22)
+            make.left.equalTo(animationView.snp.right).offset(kMargin)
+            make.height.equalTo(22)
+        }
+        
+        
+        
+        addSubview(lable2)
+        lable2.snp.makeConstraints { make in
+            make.top.equalTo(lable1.snp.bottom).offset(4)
+            make.left.equalTo(lable1.snp.left)
+            make.height.equalTo(17)
+        }
+        
+        
+        addSubview(lable3)
+        lable3.snp.makeConstraints { make in
+            make.right.equalTo(-24)
+            make.centerY.equalToSuperview()
+            make.width.equalTo(76)
+            make.height.equalTo(34)
+        }
     }
 }

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeHeadView.swift

@@ -10,7 +10,7 @@ import UIKit
 class YHHomeHeadView: UIView {
     
     // 不包含订单提示视图的总高度
-    static let fixViewH : CGFloat = (YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 20 + 20 + 1
+    static let fixViewH : CGFloat = (YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 20 + 20 + 1 + (YHAiRadarAreaView.viewH + 20) + 1
     
     // 包含订单提示视图的总高度
     static let viewHWithOrderTips: CGFloat = YHHomeHeadView.fixViewH + (20 + YHOrderTipsView.viewH)
@@ -30,43 +30,59 @@ class YHHomeHeadView: UIView {
         return view
     }()
     
-    //2.优才订单提示视图  - 未登录态不
+    //2.香港身份 香港生活
+    lazy var homeHkLife : YHHkLifeAndIdView = {
+        let view = YHHkLifeAndIdView()
+        return view
+    }()
+    
+    //3. 四大金刚区
+    lazy var homeKingKongBlock : YHHomeKingKongBlockView = {
+        let view = YHHomeKingKongBlockView()
+        return view
+    }()
+    
+    lazy var bannerLineTop : UIView = {
+        let line = UIView()
+        line.backgroundColor = UIColor(hex: 0xF0F3F7, alpha: 1.0)
+        return line
+    }()
+    
+    
+    //4.优才订单提示视图  - 未登录态不
     lazy var orderTipsView: YHOrderTipsView = {
         let view = YHOrderTipsView(frame: .zero)
         view.isHidden = true
         return view
     }()
     
-    //3. ai人脉雷达
-    lazy var aiRadarArea: YHOrderTipsView = {
-        let view = YHOrderTipsView(frame: .zero)
-        view.isHidden = true
+    
+    //5. ai人脉雷达
+    lazy var aiRadarArea: YHAiRadarAreaView = {
+        let view = YHAiRadarAreaView(frame: .zero)
         return view
     }()
     
     
-    //4.银河线下沙龙
+    //6.银河线下沙龙
     
     
-    //5.香港身份 香港生活
-    lazy var homeHkLife : YHHkLifeAndIdView = {
-        let view = YHHkLifeAndIdView()
-        return view
-    }()
     
-    //6. 四大金刚区
-    lazy var homeKingKongBlock : YHHomeKingKongBlockView = {
-        let view = YHHomeKingKongBlockView()
-        return view
+    lazy var bannerLineBottom : UIView = {
+        let line = UIView()
+        line.backgroundColor = UIColor(hex: 0xF0F3F7, alpha: 1.0)
+        return line
     }()
     
+    
+    
     // 是否隐藏优才订单提示视图
     var isNeedHideOrderTipsView:Bool = true {
         didSet {
             self.orderTipsView.isHidden = isNeedHideOrderTipsView
-            self.homeHkLife.snp.updateConstraints { make in
+            self.aiRadarArea.snp.updateConstraints { make in
                 let topMargin = isNeedHideOrderTipsView ? 20.0 : 20.0 + YHOrderTipsView.viewH + 20.0
-                make.top.equalTo(homeBannerView.snp.bottom).offset(topMargin)
+                make.top.equalTo(bannerLineTop.snp.bottom).offset(topMargin)
             }
             self.setNeedsLayout()
             self.layoutIfNeeded()
@@ -85,13 +101,6 @@ private extension YHHomeHeadView {
             make.height.equalTo(YHHomeBannerView.viewH)
         }
         
-        addSubview(orderTipsView)
-        orderTipsView.snp.makeConstraints { make in
-            make.top.equalTo(homeBannerView.snp.bottom).offset(20)
-            make.left.right.equalToSuperview()
-            make.height.equalTo(YHOrderTipsView.viewH)
-        }
-        
         addSubview(homeHkLife)
         homeHkLife.snp.makeConstraints { make in
             make.top.equalTo(homeBannerView.snp.bottom).offset(20)
@@ -106,13 +115,36 @@ private extension YHHomeHeadView {
             make.height.equalTo(YHHomeKingKongBlockView.viewH)
         }
         
-        let line = UIView()
-        line.backgroundColor = UIColor(hex: 0xF0F3F7, alpha: 1.0)
-        addSubview(line)
-        line.snp.makeConstraints { make in
+        addSubview(bannerLineTop)
+        bannerLineTop.snp.makeConstraints { make in
             make.top.equalTo(homeKingKongBlock.snp.bottom).offset(20)
             make.left.right.equalToSuperview()
             make.height.equalTo(1)
         }
+        
+        addSubview(orderTipsView)
+        orderTipsView.snp.makeConstraints { make in
+            make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHOrderTipsView.viewH)
+        }
+        
+        
+        addSubview(aiRadarArea)
+        aiRadarArea.snp.makeConstraints { make in
+            make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHAiRadarAreaView.viewH)
+        }
+        
+        
+        addSubview(bannerLineBottom)
+        bannerLineBottom.snp.makeConstraints { make in
+            make.top.equalTo(aiRadarArea.snp.bottom).offset(20)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(1)
+        }
+        
+        
     }
 }

galaxy/galaxy/Res/Assets.xcassets/Home/home_radar_bkg.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/jsons/radar/data.json

+{"v":"5.12.2","fr":25,"ip":0,"op":100,"w":110,"h":110,"nm":"首页-新增入口","ddd":0,"assets":[{"id":"image_0","w":154,"h":154,"u":"images/","p":"img_0.png","e":0},{"id":"image_1","w":110,"h":109,"u":"images/","p":"img_1.png","e":0}],"layers":[{"ddd":0,"ind":1,"ty":2,"nm":"扫描.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":50,"s":[360]},{"t":100,"s":[720]}],"ix":10},"p":{"a":0,"k":[55.25,54.625,0],"ix":2,"l":2},"a":{"a":0,"k":[77,77,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":100,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":2,"nm":"圆盘.png","cl":"png","refId":"image_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[55.25,54.625,0],"ix":2,"l":2},"a":{"a":0,"k":[55,54.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":100,"st":0,"bm":0}],"markers":[{"tm":33,"cm":"1","dr":0}],"props":{}}
\ No newline at end of file