Merge branch 'sc-1.0.5' into yinhe-live-1212

* sc-1.0.5:
  修改打包分支的名称
  数据统计紧急需求开发
  修改版本号 1.0.5.1

# Conflicts:
#	galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift

galaxy/fastlane/Fastfile

@@ -29,9 +29,11 @@ platform :ios do
   davidhuang_branch = "davidhuang"
   alex_branch = "main-bugfix-alex"
   qmas_1130_branch = "qmas-1130"
+
+  sc_105_branch = "sc-1.0.5"
   
   #打包正使用的分支
-  myPack_branch = qmas_1130_branch
+  myPack_branch = sc_105_branch
 
 
   # 打adhoc包 执行命令 fastlane galaxyTest

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -6952,7 +6952,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6978,7 +6978,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -7094,7 +7094,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7120,7 +7120,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -7299,7 +7299,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7325,7 +7325,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -7346,7 +7346,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 13;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -7372,7 +7372,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.4;
+				MARKETING_VERSION = 1.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/AppDelegate.swift

@@ -49,6 +49,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         
         YHConfigManager.shared.loadConfigData()
         
+        YHAnalytics.appInstall()
         //5.预加载
         preloadOP()
         

galaxy/galaxy/Classes/Modules/Login(登录)/Server/YHLoginManager.swift

@@ -55,6 +55,7 @@ extension YHLoginManager {
         if let userModel = userModel {
             UserDefaults.standard.set(userModel.toDictionary(), forKey: YhConstant.KLoginedInfoKey)
             UserDefaults.standard.synchronize()
+            YHAnalytics.login(userModel.id ?? "")
         }
     }
     
@@ -64,6 +65,7 @@ extension YHLoginManager {
         deviceTokenModel.registerId = ""
         UserDefaults.standard.set(nil, forKey: YhConstant.KLoginedInfoKey)
         UserDefaults.standard.synchronize()
+        YHAnalytics.loginout()
     }
     
     func loadLocalUserInfoData() {

galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift

@@ -48,6 +48,9 @@ class YHAnalytics {
 #if DEBUG
         options.enableLog = true
 #endif
+        options.enableAutoTrackChildViewScreen = true
+        options.enableHeatMap = true
+        options.enableSaveDeepLinkInfo = true
         //初始化SDK
         SensorsAnalyticsSDK.start(configOptions: options)
         
@@ -93,4 +96,16 @@ extension YHAnalytics {
     static func timeEnd(_ event: String, properties: [AnyHashable : Any]? = [:]) {
         SensorsAnalyticsSDK.sharedInstance()?.trackTimerEnd(event, withProperties: properties)
     }
+    
+    static func login(_ id: String) {
+        SensorsAnalyticsSDK.sharedInstance()?.login(id, withProperties: ["iOS":UIDevice.appVersion()])
+    }
+    
+    static func loginout() {
+        SensorsAnalyticsSDK.sharedInstance()?.logout()
+    }
+    
+    static func appInstall() {
+        SensorsAnalyticsSDK.sharedInstance()?.trackAppInstall()
+    }
 }