七鱼SDK引入

36383ed2 · Alex朱枝文 · f003b1b5 · 36383ed2 · 36383ed2 · 36383ed2
Commit 36383ed2 authored Sep 06, 2024 by Alex朱枝文
16 changed files
--- a/galaxy/Podfile
+++ b/galaxy/Podfile
@@ -103,6 +103,8 @@ target 'galaxy' do
  pod 'DragCardContainer', '1.2.0'
  #列表截图
  pod 'TYSnapshotScroll', '0.4.0'
+  #七鱼SDK
+  pod 'QY_iOS_SDK', '9.7.0'
 end

--- a/galaxy/galaxy.xcodeproj/project.pbxproj
+++ b/galaxy/galaxy.xcodeproj/project.pbxproj
@@ -10,6 +10,9 @@
 		0408C3632BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0408C3622BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift */; };
 		0409BEEB2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */; };
 		041390692C1081FA0098CB8A /* YHFileListEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041390682C1081FA0098CB8A /* YHFileListEmptyView.swift */; };
+		0414708B2C88627B00B7B688 /* YHButlerServiceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414708A2C88627B00B7B688 /* YHButlerServiceManager.swift */; };
+		0414708E2C895A9300B7B688 /* YHButlerServiceViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414708D2C895A9300B7B688 /* YHButlerServiceViewModel.swift */; };
+		041470922C898EB700B7B688 /* YHGalaxyManagerTipsItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041470912C898EB700B7B688 /* YHGalaxyManagerTipsItemView.swift */; };
 		0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */; };
 		0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */; };
 		0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */; };
@@ -464,6 +467,7 @@
 		04B360F32C636525001EB053 /* YHPrincipleWaitResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */; };
 		04B360F52C646844001EB053 /* YHPrincipleApprovedMailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */; };
 		04B360F72C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360F62C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift */; };
+		04B4B8D52C89CE5E00ED82BC /* YHButlerServiceMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B4B8D42C89CE5E00ED82BC /* YHButlerServiceMessage.swift */; };
 		04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */; };
 		04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
@@ -785,6 +789,9 @@
 		0408C3622BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVideoPlayerControlView.swift; sourceTree = "<group>"; };
 		0409BEEA2C5B41D4003FCFD7 /* YHPrincipleProfileListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleProfileListCell.swift; sourceTree = "<group>"; };
 		041390682C1081FA0098CB8A /* YHFileListEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListEmptyView.swift; sourceTree = "<group>"; };
+		0414708A2C88627B00B7B688 /* YHButlerServiceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHButlerServiceManager.swift; sourceTree = "<group>"; };
+		0414708D2C895A9300B7B688 /* YHButlerServiceViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHButlerServiceViewModel.swift; sourceTree = "<group>"; };
+		041470912C898EB700B7B688 /* YHGalaxyManagerTipsItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGalaxyManagerTipsItemView.swift; sourceTree = "<group>"; };
 		0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionSettingVC.swift; sourceTree = "<group>"; };
 		0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionCell.swift; sourceTree = "<group>"; };
 		0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyNotifySettingVC.swift; sourceTree = "<group>"; };
@@ -1241,6 +1248,7 @@
 		04B360F22C636525001EB053 /* YHPrincipleWaitResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleWaitResultViewController.swift; sourceTree = "<group>"; };
 		04B360F42C646844001EB053 /* YHPrincipleApprovedMailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleApprovedMailViewController.swift; sourceTree = "<group>"; };
 		04B360F62C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleEnvelopeModel.swift; sourceTree = "<group>"; };
+		04B4B8D42C89CE5E00ED82BC /* YHButlerServiceMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHButlerServiceMessage.swift; sourceTree = "<group>"; };
 		04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
 		04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
@@ -1568,6 +1576,24 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		041470892C885EC900B7B688 /* ButlerServiceManager(银河管家) */ = {
+			isa = PBXGroup;
+			children = (
+				04B4B8D32C89CCE400ED82BC /* M */,
+				0414708C2C895A1800B7B688 /* VM */,
+				0414708A2C88627B00B7B688 /* YHButlerServiceManager.swift */,
+			);
+			path = "ButlerServiceManager(银河管家)";
+			sourceTree = "<group>";
+		};
+		0414708C2C895A1800B7B688 /* VM */ = {
+			isa = PBXGroup;
+			children = (
+				0414708D2C895A9300B7B688 /* YHButlerServiceViewModel.swift */,
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
 		0414BDB02BCCC09000225367 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -3045,6 +3071,14 @@
 			path = Localized;
 			sourceTree = "<group>";
 		};
+		04B4B8D32C89CCE400ED82BC /* M */ = {
+			isa = PBXGroup;
+			children = (
+				04B4B8D42C89CE5E00ED82BC /* YHButlerServiceMessage.swift */,
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
 		04CE1AB52C2AD91F001CB80A /* Activity(活动) */ = {
 			isa = PBXGroup;
 			children = (
@@ -3431,6 +3465,7 @@
 				A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */,
 				A566A7992C219FA400980D06 /* YHHomeSalonAreaView.swift */,
 				A566A79B2C227C9B00980D06 /* YHOrderTipsItemView.swift */,
+				041470912C898EB700B7B688 /* YHGalaxyManagerTipsItemView.swift */,
 				04C85DE02C3677CB008B20D6 /* YHConsultantQRCodeView.swift */,
 				A59B43C62C48F68200B28379 /* YHEvaluationView.swift */,
 				04213B222C48B7F700797900 /* YHIdentityTabBar.swift */,
@@ -3818,6 +3853,7 @@
 		A5ACE91B2B4564F7002C94D2 /* Modules */ = {
 			isa = PBXGroup;
 			children = (
+				041470892C885EC900B7B688 /* ButlerServiceManager(银河管家) */,
 				A596CADD2C6B9AF200F85797 /* HomeAlertViewManager(首页弹窗管理) */,
 				A5F886B22C61CDAA00B63CF5 /* PictureReview(图片预览) */,
 				A5FD45212C523D3200908AD9 /* InteractionH5(与H5交互) */,
@@ -4131,7 +4167,7 @@
 				BuildIndependentTargetsInParallel = 1;
 				CLASSPREFIX = YH;
 				LastSwiftUpdateCheck = 1510;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1540;
 				ORGANIZATIONNAME = "https://www.galaxy-immi.com";
 				TargetAttributes = {
 					A5573ECD2B317BFF00D98EC0 = {
@@ -4278,6 +4314,23 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		F9A2927DE3EDC6863D0D1B1D /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -4285,6 +4338,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				04B4B8D52C89CE5E00ED82BC /* YHButlerServiceMessage.swift in Sources */,
 				04A671592B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift in Sources */,
 				04B360E52C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift in Sources */,
 				0425E6422BA95B1B00A5E763 /* YHSchemeTableFooterView.swift in Sources */,
@@ -4635,6 +4689,7 @@
 				044D0BFA2C215C6F00C5CF5E /* YHSettingItem.swift in Sources */,
 				0425E6442BA95FE100A5E763 /* YHSchemeTableHeadView.swift in Sources */,
 				045EEEBC2B9F171A0022A143 /* YHClipperButton.swift in Sources */,
+				0414708B2C88627B00B7B688 /* YHButlerServiceManager.swift in Sources */,
 				0430E66A2C7493A5000511E2 /* YHAdopterExampleTableViewCell.swift in Sources */,
 				045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
 				044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */,
@@ -4787,6 +4842,7 @@
 				0425E6462BA9678E00A5E763 /* YHSchemeHeadTotalScoreView.swift in Sources */,
 				044D0C0F2C2287C500C5CF5E /* YHEditViewModel.swift in Sources */,
 				045EEEA92B9F171A0022A143 /* YHWorkExperienceListViewController.swift in Sources */,
+				0414708E2C895A9300B7B688 /* YHButlerServiceViewModel.swift in Sources */,
 				04CE1AE32C2AD91F001CB80A /* YHApplyActivityAlert.swift in Sources */,
 				A598E9E42C7EEFD300F84739 /* YHTravelDocsPreparationDetailModel.swift in Sources */,
 				04A7BD132BA42F4200BD35A2 /* YHMyDocumentsDetailViewController.swift in Sources */,
@@ -4947,6 +5003,7 @@
 				045EEEA22B9F171A0022A143 /* YHWorkExperienceProjectModel.swift in Sources */,
 				04213B332C4A084600797900 /* YHHomeInfoClassifyModel.swift in Sources */,
 				04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */,
+				041470922C898EB700B7B688 /* YHGalaxyManagerTipsItemView.swift in Sources */,
 				0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */,
 				045EEECA2B9F171A0022A143 /* YHMyDocumentsListViewController.swift in Sources */,
 				049D62C52C6F272800E811A1 /* YHRiskWarningCell.swift in Sources */,
@@ -5098,11 +5155,12 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Test";
+				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Dev";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "需要访问您的文件以选择和上传";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要麦克风权限";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册进行选择照片上传来完成信息填写，如禁止将无法上传选定图片，会影响资料提交效率。";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
@@ -5239,11 +5297,12 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Uat";
+				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Dev";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "需要访问您的文件以选择和上传";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要麦克风权限";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册进行选择照片上传来完成信息填写，如禁止将无法上传选定图片，会影响资料提交效率。";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
@@ -5448,6 +5507,7 @@
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "需要访问您的文件以选择和上传";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要麦克风权限";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册进行选择照片上传来完成信息填写，如禁止将无法上传选定图片，会影响资料提交效率。";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
@@ -5489,11 +5549,12 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活";
+				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Dev";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
 				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
 				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "需要访问您的文件以选择和上传";
+				INFOPLIST_KEY_NSMicrophoneUsageDescription = "需要麦克风权限";
 				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册进行选择照片上传来完成信息填写，如禁止将无法上传选定图片，会影响资料提交效率。";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";

--- a/galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxy.xcscheme
+++ b/galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxy.xcscheme
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1540"
   version = "1.7">
   <BuildAction
      parallelizeBuildables = "YES"

--- a/galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxyForTestArchive.xcscheme
+++ b/galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxyForTestArchive.xcscheme
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1540"
   version = "1.7">
   <BuildAction
      parallelizeBuildables = "YES"

--- a/galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxyForUat.xcscheme
+++ b/galaxy/galaxy.xcodeproj/xcshareddata/xcschemes/galaxyForUat.xcscheme
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1540"
   version = "1.7">
   <BuildAction
      parallelizeBuildables = "YES"

--- a/galaxy/galaxy/AppDelegate.swift
+++ b/galaxy/galaxy/AppDelegate.swift
@@ -66,8 +66,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
        YHOneKeyLoginManager.shared.configOneKeyLogin()
        YHOSSManager.share.getOSSID()
        //for test hjl
        AGCInstance.startUp()
        AGCAppLinking.instance().handle { (link, error) in
@@ -76,6 +74,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
            print(deepLink as Any)
        }
+        // QiYu SDK初始化
+        YHButlerServiceManager.shared.setupSDK()
        //设置主窗口
        setupRootVC()
        return true

--- a/galaxy/galaxy/Applegate(JPush).swift
+++ b/galaxy/galaxy/Applegate(JPush).swift
@@ -49,6 +49,7 @@ extension AppDelegate: JPUSHRegisterDelegate {
        print("deviceToken:\(deviceTokenStr)")
        JPUSHService.registerDeviceToken(deviceToken)
        YHLoginManager.shared.deviceTokenModel.deviceToken = deviceTokenStr
+        YHButlerServiceManager.shared.updateApnsToken(token: deviceToken)
    }
    //获取token 失败
    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { //可选

--- a/galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/M/YHButlerServiceMessage.swift
+++ b/galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/M/YHButlerServiceMessage.swift
+//
+//  YHButlerServiceMessage.swift
+//  galaxy
+//
+//  Created by alexzzw on 2024/9/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+import UIKit
+// Mark: - 管家消息简单模型
+class YHButlerServiceMessage: NSObject {
+    var id: String = ""
+    var content: String = ""
+    var isRead: Bool = true
+}
+// Mark: - 用于首页显示与否
+class YHButlerServiceHomeInfoMessage: YHButlerServiceMessage {
+    var showButler: Bool = false
+}
--- a/galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/VM/YHButlerServiceViewModel.swift
+++ b/galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/VM/YHButlerServiceViewModel.swift
+//
+//  YHButlerServiceViewModel.swift
+//  galaxy
+//
+//  Created by alexzzw on 2024/9/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+import Foundation
+class YHButlerServiceViewModel {
+    //获取透传个人信息
+    func getUserInfomation(_ id: String, callBackBlock:@escaping (_ dataString: String?, _ error:YHErrorModel?)->()) {
+        let params: [String : Any] = ["yh_id": id]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.QiYu.userInfomation
+        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { json, code in
+            let dic = json.data
+            guard let data = json.data, let jsonData = try? JSONSerialization.data(withJSONObject: data, options: []), let dataString = jsonData.string(encoding: .utf8) else {
+                callBackBlock(nil, YHErrorModel())
+                return
+            }
+            callBackBlock(dataString, nil)
+        } failBlock: { err in
+            callBackBlock(nil, err)
+        }
+    }
+}
--- a/galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift
+++ b/galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift
+//
+//  YHButlerServiceManager.swift
+//  galaxy
+//
+//  Created by alexzzw on 2024/9/4.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+import UIKit
+import IQKeyboardManagerSwift
+class YHButlerServiceManager: NSObject {
+    static let shared = YHButlerServiceManager()
+    private weak var conversationManager = QYSDK.shared().conversationManager()
+    private lazy var getUserInfoViewModel: YHButlerServiceViewModel = YHButlerServiceViewModel()
+    private override init() {
+        super.init()
+        conversationManager?.setDelegate(self)
+        NotificationCenter.default.addObserver(self, selector: #selector(loginSuccess), name: YhConstant.YhNotification.didLoginSuccessNotifiction, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
+    }
+    func setupSDK() {
+        let qyOption = QYSDKOption(appKey: YhConstant.QiYuSDK.appKey)
+        qyOption.appName = YhConstant.QiYuSDK.appName
+        QYSDK.shared().register(with: qyOption)
+    }
+    func updateUserInfo(userId: String, userData: String, completion: @escaping (Bool) -> Void) {
+        let userInfo = QYUserInfo()
+        userInfo.userId = userId
+        userInfo.data = userData
+        QYSDK.shared().setUserInfo(userInfo) { success, error in
+            completion(success)
+        }
+    }
+    func updateApnsToken(token: Data) {
+        QYSDK.shared().updateApnsToken(token)
+    }
+    @MainActor func gotoButlerServiceSessionVC(sourceTitle: String? = nil, sourceUrl: String? = nil, sessionTitle: String = "银河管家", navigationController: UINavigationController?, completion: @escaping (Bool) -> Void) {
+        func gotoSessionVC() {
+            let source = QYSource()
+            source.title = sourceTitle
+            source.urlString = sourceUrl
+            IQKeyboardManager.shared.disabledDistanceHandlingClasses.append(QYSessionViewController.self)
+            guard let sessionViewController = QYSDK.shared().sessionViewController() else {
+                completion(false)
+                return
+            }
+            sessionViewController.sessionTitle = sessionTitle
+            sessionViewController.source = source
+            sessionViewController.hidesBottomBarWhenPushed = true
+            navigationController?.pushViewController(sessionViewController, completion: {
+                completion(true)
+            })
+        }
+        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
+            completion(false)
+            return
+        }
+        /// YHHUD.show(.progress(message: "加载中..."))
+        getUserInfoViewModel.getUserInfomation(userId) { [weak self] dataString, error in
+            /// YHHUD.hide()
+            guard let dataString = dataString else {
+                completion(false)
+                return
+            }
+            self?.updateUserInfo(userId: userId, userData: dataString, completion: { success in
+                gotoSessionVC()
+            })
+        }
+    }
+    private func logoutCurrentUser(completion: @escaping (Bool) -> Void) {
+        QYSDK.shared().logout { flag in
+            completion(flag)
+        }
+    }
+}
+extension YHButlerServiceManager {
+    // MARK: - 私有登录登出的处理逻辑
+    @objc private func loginSuccess() {
+        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
+            return
+        }
+        getUserInfoViewModel.getUserInfomation(userId) { [weak self] dataString, error in
+            guard let dataString = dataString else {
+                return
+            }
+            self?.updateUserInfo(userId: userId, userData: dataString, completion: { _ in })
+        }
+    }
+    @objc private func logoutSuccess() {
+        logoutCurrentUser { _ in
+            //
+        }
+    }
+}
+extension YHButlerServiceManager {
+    // MARK: - conversationManager方法
+    /// 获取所有会话的列表；非平台电商用户，只有一个会话项，平台电商用户，有多个会话项
+    func getSessionList() -> [QYSessionInfo] {
+        return conversationManager?.getSessionList() ?? []
+    }
+    /// 所有的未读数
+    func allUnreadCount() -> Int {
+        return conversationManager?.allUnreadCount() ?? 0
+    }
+    /// 清空未读数
+    func clearUnreadCount() {
+        conversationManager?.clearUnreadCount()
+    }
+}
+extension YHButlerServiceManager: QYConversationManagerDelegate {
+    // MARK: - QYConversationManagerDelegate
+    /// 会话列表变化；非平台电商用户，只有一个会话项，平台电商用户，有多个会话项
+    func onSessionListChanged(_ sessionList: [QYSessionInfo]!) {
+        //
+    }
+    /// 接收消息
+    func onReceiveMessage(_ message: QYMessageInfo!) {
+        //
+    }
+    /// 会话未读数变化
+    func onUnreadCountChanged(_ count: Int) {
+        //
+    }
+}
--- a/galaxy/galaxy/Classes/Modules/Home(首页)/V/YHGalaxyManagerTipsItemView.swift
+++ b/galaxy/galaxy/Classes/Modules/Home(首页)/V/YHGalaxyManagerTipsItemView.swift
+//
+//  YHGalaxyManagerTipsItemView.swift
+//  galaxy
+//
+//  Created by alexzzw on 2024/9/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+import UIKit
+class YHGalaxyManagerTipsItemView: UIView {
+    static let viewH = 52.0
+    private let dotWidth = 6.0
+    var buttonClickEvent: (() -> Void)?
+    private var isMessageRead: Bool = true {
+        didSet {
+            dotView.isHidden = isMessageRead
+        }
+    }
+    // 银河管家
+    private lazy var lableGalaxyMgr: UILabel = {
+        let lable : UILabel = UILabel()
+        lable.text = "银河管家"
+        lable.font = UIFont.PFSC_R(ofSize: 13)
+        lable.textColor = UIColor.mainTextColor
+        return lable
+    }()
+    // 分割线
+    private lazy var segmentationView: UIView = {
+        let view : UIView = UIView()
+        view.backgroundColor = UIColor.mainTextColor18
+        return view
+    }()
+    // 一对一专属服务
+    private lazy var lableMessage: UILabel = {
+        let lable : UILabel = UILabel()
+        lable.text = "一对一专属服务"
+        lable.font = UIFont.PFSC_R(ofSize: 13)
+        lable.textColor = UIColor.mainTextColor70
+        lable.lineBreakMode = .byTruncatingTail
+        return lable
+    }()
+    private lazy var dotView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .failColor
+        view.layer.cornerRadius = self.dotWidth/2.0
+        view.isHidden = true
+        return view
+    }()
+    // 右箭头
+    private lazy var rightIconImageV: UIImageView = {
+        let imgV : UIImageView = UIImageView()
+        imgV.contentMode = .scaleAspectFill
+        imgV.image = UIImage(named: "home_order_tips_right_arrow")
+        return imgV
+    }()
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+extension YHGalaxyManagerTipsItemView {
+    func updateMessageState(didReadMessage: Bool) {
+        self.isMessageRead = didReadMessage
+    }
+    func updateManagerTipsItemView(message: String?, didReadMessage: Bool = true) {
+        lableMessage.text = message
+        updateMessageState(didReadMessage: didReadMessage)
+    }
+}
+extension YHGalaxyManagerTipsItemView {
+    @objc private func tapButton(gestureRecognizer:UITapGestureRecognizer) {
+        buttonClickEvent?()
+    }
+    private func setupUI() {
+        backgroundColor = UIColor(hex: 0xffffff, alpha: 0.65)
+        layer.borderWidth = 0.5
+        layer.borderColor = UIColor.white.cgColor
+        addSubview(lableGalaxyMgr)
+        lableGalaxyMgr.setContentCompressionResistancePriority(.required, for: .horizontal)
+        lableGalaxyMgr.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(12)
+            make.height.equalTo(18)
+            make.width.equalTo(60)
+        }
+        addSubview(segmentationView)
+        lableGalaxyMgr.setContentCompressionResistancePriority(.required, for: .horizontal)
+        segmentationView.snp.makeConstraints { make in
+            make.left.equalTo(lableGalaxyMgr.snp.right).offset(8)
+            make.height.equalTo(10)
+            make.width.equalTo(1)
+            make.centerY.equalToSuperview()
+        }
+        addSubview(rightIconImageV)
+        rightIconImageV.setContentCompressionResistancePriority(.required, for: .horizontal)
+        rightIconImageV.snp.makeConstraints { make in
+            make.right.equalTo(-12)
+            make.centerY.equalToSuperview()
+            make.width.height.equalTo(12)
+        }
+        addSubview(dotView)
+        dotView.setContentCompressionResistancePriority(.required, for: .horizontal)
+        dotView.snp.makeConstraints { make in
+            make.width.height.equalTo(dotWidth)
+            make.right.equalTo(rightIconImageV.snp.left).offset(-12)
+            make.centerY.equalToSuperview()
+        }
+        addSubview(lableMessage)
+        lableMessage.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+        lableMessage.snp.makeConstraints { make in
+            make.left.equalTo(segmentationView.snp.right).offset(8)
+            make.height.equalTo(18)
+            make.centerY.equalToSuperview()
+            make.right.lessThanOrEqualTo(dotView.snp.left).offset(-12)
+        }
+        let tap = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
+        addGestureRecognizer(tap)
+    }
+}
--- a/galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift
+++ b/galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift
@@ -9,25 +9,37 @@
 import UIKit
 import AttributedString
-class YHOrderTipsView: UIView {
+enum YHOrderTipsViewStyleType: Int {
+    case none = 0
-    private static let viewH : CGFloat = 91.0
+    case onlyMgr = 1
-    private static let viewH2 : CGFloat = 162.0
+    case onlyOneOrder = 2
-    private static let viewH3 : CGFloat = 226.0
+    case mgrAndOrder = 3
-    var tipViewH : CGFloat {
+    func getHeight() -> CGFloat {
+        switch self {
-        guard let arr = arrLastTwoMessage else {
+        case .none:
            return YHOrderTipsView.viewH
-        }
+        case .onlyMgr, .onlyOneOrder:
-        if arr.count > 1 {
-            return YHOrderTipsView.viewH3
-        } else if arr.count == 1 {
            return YHOrderTipsView.viewH2
+        case .mgrAndOrder:
+            return YHOrderTipsView.viewH3
        }
-        return YHOrderTipsView.viewH
    }
+}
+class YHOrderTipsView: UIView {
+    fileprivate static let viewH : CGFloat = 91.0
+    fileprivate static let viewH2 : CGFloat = 162.0
+    fileprivate static let viewH3 : CGFloat = 226.0
+    private var orderTipsViewStyle: YHOrderTipsViewStyleType = .none
+    var tipViewH : CGFloat {
+        return orderTipsViewStyle.getHeight()
+    }
+    var galaxyManagerItemClickEvent: (() -> Void)?
    override init(frame: CGRect) {
        super.init(frame: frame)
@@ -37,7 +49,6 @@ class YHOrderTipsView: UIView {
        addGestureRecognizer(tap)
    }
    var dataModelForBasicInfo : YHSignerInfoModel? {
        didSet {
            updateBasicInfo()
@@ -47,10 +58,20 @@ class YHOrderTipsView: UIView {
    var arrLastTwoMessage : [YHHomeLastMessageModel]? {
        didSet {
-            updateLastTwoMessges()
+            updateItems()
        }
    }
+    var customerServiceMessage: YHButlerServiceHomeInfoMessage? {
+        didSet {
+            if let oldId = oldValue?.id, oldId.count > 0, oldId == customerServiceMessage?.id, oldValue?.showButler == customerServiceMessage?.showButler, oldValue?.isRead != customerServiceMessage?.isRead {
+                mgrItem.updateMessageState(didReadMessage: customerServiceMessage?.isRead ?? true)
+            } else {
+                updateItems()
+            }
+        }
+    }
    required init?(coder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }
@@ -85,33 +106,58 @@ class YHOrderTipsView: UIView {
            make.edges.equalToSuperview()
        }
+        switch orderTipsViewStyle {
-        if let arr = arrLastTwoMessage {
+        case .none:
-            if arr.count > 1 {
+            mgrItem.snp.remakeConstraints { make in
-                firstItem.snp.makeConstraints { make in
+                make.top.equalTo(lableName.snp.bottom).offset(20)
-                    make.top.equalTo(lableName.snp.bottom).offset(20)
+                make.left.equalTo(kMargin)
-                    make.left.equalTo(kMargin)
+                make.width.height.equalTo(0)
-                    make.right.equalTo(-20)
+            }
-                    make.height.equalTo(YHOrderTipsItemView.viewH)
+            firstItem.snp.remakeConstraints { make in
-                }
+                make.top.equalTo(mgrItem.snp.bottom).offset(20)
-                secondItem.snp.makeConstraints { make in
+                make.left.equalTo(kMargin)
-                    make.top.equalTo(firstItem.snp.bottom).offset(12)
+                make.width.height.equalTo(0)
-                    make.left.equalTo(kMargin)
+            }
-                    make.right.equalTo(-20)
+        case .onlyMgr:
-                    make.height.equalTo(YHOrderTipsItemView.viewH)
+            mgrItem.snp.remakeConstraints { make in
-                }
+                make.top.equalTo(lableName.snp.bottom).offset(20)
-            } else if arr.count == 1 {
+                make.left.equalTo(kMargin)
-                firstItem.snp.makeConstraints { make in
+                make.right.equalTo(-kMargin)
-                    make.top.equalTo(lableName.snp.bottom).offset(20)
+                make.height.equalTo(YHGalaxyManagerTipsItemView.viewH)
-                    make.left.equalTo(kMargin)
+            }
-                    make.right.equalTo(-kMargin)
+            firstItem.snp.remakeConstraints { make in
-                    make.height.equalTo(YHOrderTipsItemView.viewH)
+                make.top.equalTo(mgrItem.snp.bottom).offset(20)
-                }
+                make.left.equalTo(kMargin)
+                make.width.height.equalTo(0)
+            }
+        case .onlyOneOrder:
+            mgrItem.snp.makeConstraints { make in
+                make.top.equalTo(lableName.snp.bottom).offset(20)
+                make.left.equalTo(kMargin)
+                make.width.height.equalTo(0)
+            }
+            firstItem.snp.remakeConstraints { make in
+                make.top.equalTo(lableName.snp.bottom).offset(20)
+                make.left.equalTo(kMargin)
+                make.right.equalTo(-kMargin)
+                make.height.equalTo(YHOrderTipsItemView.viewH)
+            }
+        case .mgrAndOrder:
+            mgrItem.snp.remakeConstraints { make in
+                make.top.equalTo(lableName.snp.bottom).offset(20)
+                make.left.equalTo(kMargin)
+                make.right.equalTo(-kMargin)
+                make.height.equalTo(YHGalaxyManagerTipsItemView.viewH)
+            }
+            firstItem.snp.remakeConstraints { make in
+                make.top.equalTo(mgrItem.snp.bottom).offset(20)
+                make.left.equalTo(kMargin)
+                make.right.equalTo(-kMargin)
+                make.height.equalTo(YHOrderTipsItemView.viewH)
            }
        }
    }
    //智能助理
    lazy var lableTip: UILabel = {
        let lable : UILabel = UILabel()
@@ -165,17 +211,19 @@ class YHOrderTipsView: UIView {
    lazy var firstItem: YHOrderTipsItemView = {
        let itemView : YHOrderTipsItemView = YHOrderTipsItemView()
-//        itemView.indexItem = 1
        itemView.isHidden = true
        return itemView
    }()
-    lazy var secondItem: YHOrderTipsItemView = {
+    private lazy var mgrItem: YHGalaxyManagerTipsItemView = {
-        let itemView : YHOrderTipsItemView = YHOrderTipsItemView()
+        let itemView: YHGalaxyManagerTipsItemView = YHGalaxyManagerTipsItemView()
-//        itemView.indexItem = 2
        itemView.isHidden = true
+        itemView.buttonClickEvent = { [weak self] in
+            self?.galaxyManagerItemClickEvent?()
+        }
        return itemView
    }()
 }
 private extension YHOrderTipsView {
@@ -215,33 +263,36 @@ private extension YHOrderTipsView {
        layoutIfNeeded()
    }
-    func updateLastTwoMessges() {
+    private func updateItems() {
-        guard let arr = arrLastTwoMessage else {
+        if let mgrMessage = customerServiceMessage, mgrMessage.showButler {
-            firstItem.isHidden = true
+            mgrItem.isHidden = false
-            secondItem.isHidden = true
+            mgrItem.updateManagerTipsItemView(message: mgrMessage.content, didReadMessage: mgrMessage.isRead)
-            return
+        } else {
+            mgrItem.isHidden = true
+            mgrItem.updateManagerTipsItemView(message: nil, didReadMessage: true)
        }
-        if arr.count > 1 {
-            firstItem.isHidden = false
+        if let first = arrLastTwoMessage?.first {
-            secondItem.isHidden = false
+            firstItem.message = first
-        } else if arr.count == 1 {
            firstItem.isHidden = false
-            secondItem.isHidden = true
        } else {
            firstItem.isHidden = true
-            secondItem.isHidden = true
+            firstItem.message = nil
        }
+        if mgrItem.isHidden == false, firstItem.isHidden == false {
-        if let first = arrLastTwoMessage?.first, let last = arrLastTwoMessage?.last {
+            orderTipsViewStyle = .mgrAndOrder
-            firstItem.message = first
+        } else if mgrItem.isHidden == true, firstItem.isHidden == false {
-            secondItem.message = last
+            orderTipsViewStyle = .onlyOneOrder
+        } else if mgrItem.isHidden == false, firstItem.isHidden == true {
+            orderTipsViewStyle = .onlyOneOrder
+        } else {
+            orderTipsViewStyle = .none
        }
        setNeedsLayout()
        layoutIfNeeded()
    }
    @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
        goTabBarBy(tabType: .service)
    }
@@ -334,9 +385,8 @@ private extension YHOrderTipsView {
 //            make.right.equalTo(-kMargin)
        }
+        addSubview(mgrItem)
        addSubview(firstItem)
-        addSubview(secondItem)
        layoutIfNeeded()
        setNeedsLayout()

--- a/galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift
+++ b/galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift
@@ -138,6 +138,8 @@ class YHMessageListVC: YHBaseViewController {
    }
    @objc func didCleanButtonClicked() {
+//        gotoYinHeManager()
+//        return
        let unreadMessages = self.msgArr.filter { $0.unreadCount > 0 }
        if unreadMessages.count <= 0 {
            YHHUD.flash(message: "暂无未读消息~")
@@ -314,6 +316,17 @@ class YHMessageListVC: YHBaseViewController {
    }
 }
+extension YHMessageListVC {
+    private func gotoYinHeManager() {
+        guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
+            return
+        }
+        YHButlerServiceManager.shared.gotoButlerServiceSessionVC(navigationController: navigationController, completion: { _ in })
+    }
+}
 extension YHMessageListVC {
    @objc func didEnableNotifyBtnClicked() {

--- a/galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift
+++ b/galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift
@@ -210,6 +210,16 @@ extension YhConstant {
    }
+    // MARK: - 七鱼客服系统SDK
+    struct QiYuSDK {
+        static let appKey = "7922dbeb48141b15d2ae2e91cc156af5"
+#if DEBUG
+        static let appName = "银河港生活iOS-Dev"
+#else
+        static let appName = "银河港生活iOS"
+#endif
+    }
    // MARK: -  通知相关 名称
    class YhNotification {
        //登录成功

--- a/galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
+++ b/galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
@@ -510,4 +510,10 @@ class YHAllApiName {
        static let dependentsCheck = "super-app/order/information/dependents/check"
    }
+    // 七鱼透传信息获取
+    struct QiYu {
+        // 获取个人信息
+        static let userInfomation = "super-app/qiyu/user/information"
+    }
 }
--- a/galaxy/galaxy/Res/galaxy-Bridge-Header.h
+++ b/galaxy/galaxy/Res/galaxy-Bridge-Header.h
@@ -18,6 +18,8 @@
 #import <UserNotifications/UserNotifications.h>
 // 列表截图
 #import "TYSnapshotScroll.h"
+// 七鱼SDK
+#import <QYSDK/QYSDK.h>
 #endif