Merge branch 'yinhe-live-1212' of...

Merge branch 'yinhe-live-1212' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into yinhe-live-1212

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHPlayerManager.swift

@@ -738,8 +738,9 @@ extension YHPlayerManager {
             } else {
                 if let window = floatingWindow,
                       let player = window.player, window.source == .configured {
-                    window.isHidden = true
-                    stopConfiguredFloatingWindow(window, player)
+//                    window.isHidden = true
+//                    stopConfiguredFloatingWindow(window, player)
+                    exitFloating()
                 }
                 enableBannerAutoPlay()
                 //resumeBannerPlayback()
@@ -747,8 +748,9 @@ extension YHPlayerManager {
         } else {
             if let window = floatingWindow,
                   let player = window.player, window.source == .configured {
-                window.isHidden = true
-                stopConfiguredFloatingWindow(window, player)
+//                window.isHidden = true
+//                stopConfiguredFloatingWindow(window, player)
+                exitFloating()
             }
             stopBannerPlayback()
         }

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

@@ -28,7 +28,7 @@ class YHAnalyticsUnit: NSObject {
                                         "YHActivityListViewController": "APP_FriendsTab_Events",
                                         "YHInformationPerfectListVC": "APP_Elite_Document_Service_MyInformation",
                                         "YHMyNewSchemeViewController": "APP_Elite_Document_Service_MyPlan",
-                                        "YHMineCertificateEntryViewController": "APP_Elite_Document_Service_MyDocuments",
+                                        "YHMineCertificateEntryViewController": "APP_Elite_Document_Service_MyCertificate",
                                         "YHMyDocumentsListViewController": "APP_Elite_Document_Service_MyDocuments",
                                         "YHMySignatureListViewController": "APP_Elite_Document_Service_MySignature",
                                         "YHPrincipleWaitResultViewController":"APP_Elite_Document_Service_HongKongGovernmentApprovalResult",
@@ -51,5 +51,6 @@ class YHAnalyticsUnit: NSObject {
                                         "YHHKVisaRenewalPaymentVC": "APP_Elite_Renewal_Service_RenewalVisaPayment",
                                         "YHResignUploadTravelCardListViewController": "APP_Elite_Renewal_Service_UploadTravelDocuments",
                                         "YHSelectViewController": "APP_HomeTab_GalaxySelection",
-                                        "YHLifeViewController": "APP_LiveList"]
+                                        "YHLifeViewController": "APP_LiveList",
+                                        "YHServiceCenterViewController": "APP_ServiceTab_ApplicationStage"]
 }