解决后段乱填数据造成的组件崩溃问题

galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift

@@ -29,11 +29,9 @@ class YHBaseViewController: UIViewController {
         IQKeyboardManager.shared.isEnabled = true
 #endif
 //        navigationController?.interactivePopGestureRecognizer?.delegate = self
-        
-        let key = String(describing: type(of: self))
-        if YHAnalyticsUnit.events.keys.contains(key) {
-            guard let event = YHAnalyticsUnit.events[key] else { return }
-            YHAnalytics.track(event)
+        let key = getKeys()
+        if !key.isEmpty {
+            YHAnalytics.track(getKeys())
         }
     }
     
@@ -53,22 +51,38 @@ class YHBaseViewController: UIViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        let key = String(describing: type(of: self))
-        if YHAnalyticsUnit.events.keys.contains(key) {
-            guard let event = YHAnalyticsUnit.events[key] else { return }
-            YHAnalytics.timeStrat(event)
+        let key = getKeys()
+        if !key.isEmpty {
+            YHAnalytics.timeStrat(getKeys())
         }
     }
     
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
+        let key = getKeys()
+        if !key.isEmpty {
+            YHAnalytics.timeEnd(getKeys())
+        }
+    }
+    
+    func getKeys() -> String {
         let key = String(describing: type(of: self))
         if YHAnalyticsUnit.events.keys.contains(key) {
-            guard let event = YHAnalyticsUnit.events[key] else { return }
-            YHAnalytics.timeEnd(event)
+            guard let event = YHAnalyticsUnit.events[key] else { return ""}
+            if key == "YHHomeInfoDetailContainerViewController" || key == "YHH5WebViewVC" {
+                let subevent = self.title ?? ""
+                let events = event as? [String: String] ?? [:]
+                if events.keys.contains(subevent) {
+                    guard let subEvent = events[subevent] else { return ""}
+                    return subEvent
+                }
+            }
+            return key
         }
+        return ""
     }
     
+    
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         self.navigationController?.interactivePopGestureRecognizer?.isEnabled = true

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeViewController.swift

@@ -23,7 +23,7 @@ class YHLifeViewController: YHBaseViewController {
     lazy var myCollectView = {
         // 设置布局方向
         let flowLayout = UICollectionViewFlowLayout()
-        flowLayout.itemSize = CGSize(width: 162, height: 222)
+        flowLayout.itemSize = CGSize(width: (KScreenWidth - 52)/2, height: 222)
         flowLayout.minimumInteritemSpacing = 12.0
         flowLayout.minimumLineSpacing = 12.0
         flowLayout.scrollDirection = .vertical

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

@@ -122,6 +122,7 @@ extension YHHomeInfoSectionHeadView: UICollectionViewDelegate, UICollectionViewD
         if 0 <= indexPath.row, indexPath.row < self.items.count {
             if let item = self.items[indexPath.row] {
                 let vc = YHHomeInfoDetailContainerViewController()
+                vc.title = item.name
                 vc.customTitle = item.name
                 vc.isHaveHot = item.hotNum > 0
                 vc.classifyId = item.id

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

@@ -173,6 +173,7 @@ class YHServiceOrderListView: YHBaseViewController {
                         url = url + "&app_platform=ios" + "&app_version=" + UIDevice.appVersion()
                         printLog("UURL: \(url)")
                         let vc = YHH5WebViewVC()
+                        vc.title = "赴港行程指引"
                         vc.url = url
                         vc.isFullScreenFlag = false
                         vc.navTitle = "赴港行程指引"
@@ -355,6 +356,7 @@ extension YHServiceOrderListView {
 //                        var url = "http://192.168.23.35:10300/" + "superAppBridge.html#/guide/identity"
             url = url + "?param=" + YHLoginManager.shared.h5Token
             let vc = YHH5WebViewVC()
+            vc.title = "身份续签指引"
             vc.navTitle = "身份续签指引"
             vc.url = url
             vc.isFullScreenFlag = false
@@ -372,6 +374,7 @@ extension YHServiceOrderListView {
             
             url = url + "?param=" + YHLoginManager.shared.h5Token + "&batchID=\(stepID)" + "&order_id=\(orderID)"
             let vc = YHH5WebViewVC()
+            vc.title = "我的续签方案"
             vc.navTitle = "我的续签方案"
             vc.url = url
             vc.isSupportWebviewInterBackFlag = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift

@@ -35,7 +35,10 @@ class YHDatePickView: UIView {
     var lastIsTaday: Bool = false {
         didSet {
             guard let type = type else { return }
-            let index = self.currentDateCom.year! - self.dateCom.year!
+            var index = self.currentDateCom.year! - self.dateCom.year!
+            if index > 99 {
+                index = 0
+            }
             switch type {
             case .yyyymmdd:
                 pickerView.selectRow(99 - index, inComponent: 0, animated: true)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -482,6 +482,7 @@ class YHItemView: UIView {
                 title = "请选择出生日期"
                 isLastDay = true
             }
+
             YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: isLastDay, currentDay: dataSource?.message ?? "") { date in
                 self.dataSource?.message = date
                 self.updateAllViews()

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -331,6 +331,7 @@ extension YHJsApi {
                             let hot_num : Int = jsonObject["hot_num"] as? Int ?? 0
                             if id > 0 {
                                 let vc = YHHomeInfoDetailContainerViewController()
+                                vc.title = name
                                 vc.customTitle = name
                                 vc.isHaveHot = hot_num > 0
                                 vc.classifyId = id

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -404,6 +404,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 url = url + "?param=" + YHLoginManager.shared.h5Token
                 
                 let vc = YHH5WebViewVC()
+                vc.title = "积分中心"
                 vc.navTitle = "积分中心"
                 vc.url = url
                 vc.isFullScreenFlag = false
@@ -413,6 +414,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         case .myTestCode://我的测评码
             printLog("我的测评码")
             let vc = YHHomeWebViewController()
+            vc.title = "香港身份测评码"
             vc.vcTitle = "香港身份测评码"
             vc.showSavePicBottomFlag = true
             vc.url = "https://cdn-public.galaxy-immi.com/app/cepingma.png"

galaxy/galaxy/Classes/Tools/Analytics/YHAnalyticsUnit.swift

@@ -9,5 +9,45 @@
 import UIKit
 
 class YHAnalyticsUnit: NSObject {
-    static var events: [String: String] = ["YHHomeInformationViewController": "APP_HomeTab_News"]
+    static var events: [String: Any] = ["YHHomeInformationViewController": "APP_HomeTab_News", 
+                                        "YHHomeInfoDetailContainerViewController": ["身份福利": "APP_HomeTab_News_IdentityBenefits",
+                                                                                    "续签攻略": "APP_HomeTab_News_RenewalStrategy",
+                                                                                    "政策解读": "APP_HomeTab_News_PolicyInterpretation",
+                                                                                    "子女教育": "APP_HomeTab_News_ChildrenEducation",
+                                                                                    "民生医疗": "APP_HomeTab_News_Healthcare",
+                                                                                    "税务规划": "APP_HomeTab_News_TaxPlanning",
+                                                                                    "时事热点": "APP_HomeTab_News_CurrentAffairs",
+                                                                                    "关于银河": "APP_HomeTab_News_AboutGalaxy"],
+                                        "YHH5WebViewVC":["积分中心": "APP_MyTab_PointsCenter",
+                                                         "赴港行程指引": "APP_Elite_Document_Service_HongKongTravelGuidance",
+                                                         "身份续签指引": "APP_Elite_Renewal_Service_RenewalGuidance",
+                                                         "我的续签方案": "APP_Elite_Renewal_Service_RenewalPlan"],
+                                        "YHMessageListVC": "APP_MyTab_MyMessages",
+                                        "YHHomeWebViewController": ["香港身份测评码": "APP_MyTab_MyAssessmentCode"],
+                                        "YHMatchUserViewController": "APP_FriendsTab_Connections",
+                                        "YHActivityListViewController": "APP_FriendsTab_Events",
+                                        "YHInformationPerfectListVC": "APP_Elite_Document_Service_MyInformation",
+                                        "YHMyNewSchemeViewController": "APP_Elite_Document_Service_MyPlan",
+                                        "YHMineCertificateEntryViewController": "APP_Elite_Document_Service_MyDocuments",
+                                        "YHMyDocumentsListViewController": "APP_Elite_Document_Service_MyDocuments",
+                                        "YHMySignatureListViewController": "APP_Elite_Document_Service_MySignature",
+                                        "YHPrincipleWaitResultViewController":"APP_Elite_Document_Service_HongKongGovernmentApprovalResult",
+                                        "YHPrincipleApprovedResultVC": "APP_Elite_Document_Service_HongKongGovernmentApprovalResult",
+                                        "YHOfficialApprovalResultVC": "APP_Elite_Document_Service_HongKongGovernmentApprovalResult",
+                                        "YHAddAdoptersViewController": "APP_Elite_Document_Service_AddDependant",
+                                        "YHFamilyInfoConfirmViewController": "APP_Elite_Document_Service_FamilyInfoConfirmation",
+                                        "YHCertificateAppointViewController": "APP_Elite_Document_Service_HongKongAppointment",
+                                        "YHTravelDocsPreparationListViewController": "APP_Elite_Document_Service_ElectronicVisaPayment",
+                                        "YHVisaPaymentVC":"APP_Elite_Document_Service_ElectronicVisaPayment",
+                                        "YHUploadCertificateVC": "APP_Elite_Document_Service_UploadPassport",
+                                        "YHHKImmigrationRecordsVC": "APP_Elite_Renewal_Service_HongKongRecord",
+                                        "YHResignCertificateListViewController": "APP_Elite_Renewal_Service_RenewalDocuments",
+                                        "YHResinMaterialManageContainerVC": "APP_Elite_Renewal_Service_RenewalDocumentManagement",
+                                        "YHResignDocumentManagementVC": "APP_Elite_Renewal_Service_RenewalDocumentManagement",
+                                        "YHResignConfirmInfoListViewController": "APP_Elite_Renewal_Service_RenewalInfoConfirmation",
+                                        "YHResignAppointContainerViewController": "APP_Elite_Renewal_Service_HongKongSubmissionAppointment",
+                                        "YHResignUploadDocListViewController" : "APP_Elite_Renewal_Service_RenewalSupplementaryDocuments",
+                                        "YHLookResignResultViewController": "APP_Elite_Renewal_Service_ViewRenewalResult",
+                                        "YHHKVisaRenewalPaymentVC": "APP_Elite_Renewal_Service_RenewalVisaPayment",
+                                        "YHResignUploadTravelCardListViewController": "APP_Elite_Renewal_Service_UploadTravelDocuments"]
 }