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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8116,7 +8116,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8143,7 +8143,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8262,7 +8262,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8289,7 +8289,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8470,7 +8470,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8497,7 +8497,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8518,7 +8518,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8545,7 +8545,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.1.6;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -69,7 +69,7 @@ class YHBaseViewController: UIViewController {
         let key = String(describing: type(of: self))
         if YHAnalyticsUnit.events.keys.contains(key) {
             guard let event = YHAnalyticsUnit.events[key] else { return nil}
-            if key == "YHHomeInfoDetailContainerViewController" || key == "YHH5WebViewVC" {
+            if key == "YHHomeInfoDetailContainerViewController" || key == "YHH5WebViewVC" || key == "YHAIRobotChatViewController" {
                 let subevent = self.title ?? ""
                 let events = event as? [String: String] ?? [:]
                 if events.keys.contains(subevent) {

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIServiceListViewController.swift

@@ -176,6 +176,7 @@ extension YHAIServiceListViewController: UICollectionViewDelegate, UICollectionV
                         vc.listItemId = model.id
                         vc.conversationId = sesseionId
                         vc.robotType = model.businessType
+                        vc.title = model.titleName
                         self.navigationController?.pushViewController(vc, animated: true)
                     }
                 }

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/M/YHAIListModel.swift

@@ -25,6 +25,7 @@ enum YHAIRobotType: String {
     case sale = "saleBot"
     case image = "entryPrecautionsImage"
     case business = "businessBot"
+    
 }
 
 class YHEntranceconfigModel: SmartCodable {
@@ -39,6 +40,14 @@ class YHEntranceconfigModel: SmartCodable {
     var businessType: String = ""
     var redirectPath: String = ""
     
+    var titleName : String {
+        if businessType == "businessBot" {
+            return "银河商务规划师"
+        } else {
+            return ""
+        }
+    }
+    
     func isNeedShowBannerHeader() -> Bool {
         if  businessType == YHAIRobotType.education.rawValue || businessType == YHAIRobotType.sale.rawValue || businessType == YHAIRobotType.business.rawValue {
             return true

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

@@ -21,7 +21,8 @@ class YHAnalyticsUnit: NSObject {
                                         "YHH5WebViewVC":["积分中心": "APP_MyTab_PointsCenter",
                                                          "赴港行程指引": "APP_Elite_Document_Service_HongKongTravelGuidance",
                                                          "身份续签指引": "APP_Elite_Renewal_Service_RenewalGuidance",
-                                                         "我的续签方案": "APP_Elite_Renewal_Service_RenewalPlan"],
+                                                         "我的续签方案": "APP_Elite_Renewal_Service_RenewalPlan",
+                                                         "银河商务": "Business_Delivery_Entry"],
                                         "YHMessageListVC": "APP_MyTab_MyMessages",
                                         "YHHomeWebViewController": ["香港身份测评码": "APP_MyTab_MyAssessmentCode"],
                                         "YHMatchUserViewController": "APP_FriendsTab_Connections",
@@ -54,5 +55,6 @@ class YHAnalyticsUnit: NSObject {
                                         "YHLifeViewController": "APP_LiveList",
                                         "YHServiceCenterViewController": "APP_ServiceTab_ApplicationStage",
                                         "YHVODPlayerViewController": "APP_RecordedPage",
-                                        "YHLivePlayerViewController": "APP_LivePage"]
+                                        "YHLivePlayerViewController": "APP_LivePage",
+                                        "YHAIRobotChatViewController": ["银河商务规划师": "APP_Gangxiaobao_Galaxy_Business_Planner"]]
 }