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

# Conflicts: # galaxy/galaxy.xcodeproj/project.pbxproj

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev
# Conflicts: # galaxy/galaxy.xcodeproj/project.pbxproj
24c2c376 · Steven杜宇 · 40fd3584 · d2cefc7d · 24c2c376 · 24c2c376
Commit 24c2c376 authored Jul 04, 2024 by Steven杜宇
16 changed files
--- a/galaxy/fastlane/Fastfile
+++ b/galaxy/fastlane/Fastfile
@@ -17,7 +17,8 @@ platform :ios do
  youhua_branch = "youhua-dev"
  
  #打包正使用的分支
-  myPack_branch = "091"
+  myPack_branch = youhua_branch
+

  # 打adhoc包 执行命令 fastlane galaxyTest
  lane :galaxyTest do 
@@ -74,7 +75,6 @@ platform :ios do

  
  # 打realease包 执行命令 fastlane galaxyRelease
-
 lane :galaxyAdhoc do 
    # add actions here: https://docs.fastlane.tools/actions

@@ -82,9 +82,9 @@ platform :ios do
    # 拉取最新代码
    sh "git pull origin #{myPack_branch}"
    # 显示git当前分支最新submit id
-    # sh "git rev-parse HEAD"
+    sh "git rev-parse HEAD"
    # 更新pod第三方库
-    # cocoapods(use_bundle_exec: true)
+    cocoapods(use_bundle_exec: true)
  
    gym(
    workspace: 'galaxy.xcworkspace',
@@ -126,4 +126,58 @@ platform :ios do
    api_key: "#{release_pgyer_api_key}"
   )
  end
-end
\ No newline at end of file
+
+
+  # 打uat包 执行命令 fastlane galaxyRelease
+ lane :galaxyUat do 
+    # add actions here: https://docs.fastlane.tools/actions
+
+    sh "git checkout #{myPack_branch}"
+    # 拉取最新代码
+    sh "git pull origin #{myPack_branch}"
+    # 显示git当前分支最新submit id
+    # sh "git rev-parse HEAD"
+    # 更新pod第三方库
+    # cocoapods(use_bundle_exec: true)
+  
+    gym(
+    workspace: 'galaxy.xcworkspace',
+    # 每次打包之前clean一下
+    clean: true,    
+    # 打包出 ipa 文件的路径，我放到了桌面文件夹，你自行更改文件夹
+    output_directory: './App/uat',
+    # 打包的名称，可任意取 
+    output_name: 'galaxy-uat.ipa', 
+    # 项目的 scheme，自己项目名   .xcworkspace 前面的项目名就是
+    scheme: "galaxyForUat",      
+    # 默认 Release，Release or Debug     
+    configuration: 'UatEnv', 
+    # 是否包含 bitcode  
+    include_bitcode: false,  
+    # 是否包含 symbols 
+    include_symbols: true, 
+    # 打包导出方式，包含 app-store, validation, ad-hoc, package, enterprise, development, developer-id and mac-application   
+    export_method: 'ad-hoc',  
+    # 这个设置是为了设置 xcode 自动配置证书和配置文件，当然也可以手动配置，可以参考文档
+    # export_xcargs: '-allowProvisioningUpdates', 
+    
+    #手动配置证书和配置文件
+    export_options: {
+      signingStyle: "manual",
+      provisioningProfiles: {
+       "#{bundle_id}" => "#{adhoc_profile_name}",
+      }
+    }
+    )
+
+
+    # mac上的通知弹窗，通知打包完毕
+    notification(app_icon: "./fastlane/icon.png", title: "manager", subtitle: "打包成功，已导出安装包", message: "准备发布到蒲公英中……")
+
+   #配置上传蒲公英账号  蒲公英的 api_key和 user_key  用自己蒲公英账号的，别用我的！！！如果没有可删除
+   pgyer(
+    # 蒲公英 API Key
+    api_key: "#{adhoc_pgyer_api_key}"
+   )
+  end
+end
--- a/galaxy/fastlane/README.md
+++ b/galaxy/fastlane/README.md
@@ -31,6 +31,14 @@ Description of what the lane does



+### ios galaxyUat
+
+```sh
+[bundle exec] fastlane ios galaxyUat
+```
+
+
+
 ----

 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.

--- a/galaxy/galaxy.xcodeproj/project.pbxproj
+++ b/galaxy/galaxy.xcodeproj/project.pbxproj
@@ -353,6 +353,10 @@
 		04EA37742BEA0A3400DBAF64 /* YHShareManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */; };
 		04EC2F812C22888E002907D7 /* YHFriendRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */; };
 		04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */; };
+		04F0ABF32C364F9400518C30 /* home.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF02C364F9400518C30 /* home.json */; };
+		04F0ABF42C364F9400518C30 /* my.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF12C364F9400518C30 /* my.json */; };
+		04F0ABF52C364F9400518C30 /* community.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF22C364F9400518C30 /* community.json */; };
+		04F0ABF72C364F9D00518C30 /* service.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF62C364F9D00518C30 /* service.json */; };
 		04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
 		04F5F8602C1944D5004A463C /* YHHKCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F85F2C1944D5004A463C /* YHHKCenterViewController.swift */; };
 		04F5F8622C1945C0004A463C /* YHHKIdentityCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F8612C1945C0004A463C /* YHHKIdentityCardViewController.swift */; };
@@ -924,6 +928,10 @@
 		04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareManager.swift; sourceTree = "<group>"; };
 		04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendRequestView.swift; sourceTree = "<group>"; };
 		04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutGalaxyViewController.swift; sourceTree = "<group>"; };
+		04F0ABF02C364F9400518C30 /* home.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = home.json; sourceTree = "<group>"; };
+		04F0ABF12C364F9400518C30 /* my.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = my.json; sourceTree = "<group>"; };
+		04F0ABF22C364F9400518C30 /* community.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = community.json; sourceTree = "<group>"; };
+		04F0ABF62C364F9D00518C30 /* service.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = service.json; sourceTree = "<group>"; };
 		04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateSheetView.swift; sourceTree = "<group>"; };
 		04F5F85F2C1944D5004A463C /* YHHKCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKCenterViewController.swift; sourceTree = "<group>"; };
 		04F5F8612C1945C0004A463C /* YHHKIdentityCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKIdentityCardViewController.swift; sourceTree = "<group>"; };
@@ -2916,6 +2924,10 @@
 		A5DF3D4A2BF9A304003D5F03 /* jsons */ = {
 			isa = PBXGroup;
 			children = (
+				04F0ABF62C364F9D00518C30 /* service.json */,
+				04F0ABF22C364F9400518C30 /* community.json */,
+				04F0ABF02C364F9400518C30 /* home.json */,
+				04F0ABF12C364F9400518C30 /* my.json */,
 				043BA8822C24360C006EF02D /* people_rotate */,
 				043BA87C2C2435D4006EF02D /* people_launch */,
 				043BA8762C243477006EF02D /* people_head */,
@@ -3057,6 +3069,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */,
+				04F0ABF42C364F9400518C30 /* my.json in Resources */,
 				049663C02BF729F6003C8295 /* galaxy_refresher.gif in Resources */,
 				045EEED42B9F171A0022A143 /* scoreOptionData.plist in Resources */,
 				A5EE42032C216C78005BBA5D /* data.json in Resources */,
@@ -3066,7 +3079,9 @@
 				A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */,
 				A51044182B493675006B60BB /* README.md in Resources */,
 				A5EE42012C216C78005BBA5D /* img_0.png in Resources */,
+				04F0ABF32C364F9400518C30 /* home.json in Resources */,
 				A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */,
+				04F0ABF52C364F9400518C30 /* community.json in Resources */,
 				04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
 				048FA0332BFDDFF400AD3BA9 /* submit_head_animation.gif in Resources */,
 				A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
@@ -3076,6 +3091,7 @@
 				043BA8892C244129006EF02D /* people_head.json in Resources */,
 				043BA8912C250E94006EF02D /* people_launch.json in Resources */,
 				043BA88F2C250E69006EF02D /* people_rotate.json in Resources */,
+				04F0ABF72C364F9D00518C30 /* service.json in Resources */,
 				047619ED2BA9B9C900F45358 /* area.plist in Resources */,
 				A5EE42002C216C78005BBA5D /* img_1.png in Resources */,
 				048FA0342BFDDFF400AD3BA9 /* submit_page_scroll.gif in Resources */,
@@ -3823,6 +3839,147 @@
 			};
 			name = TestEnv;
 		};
+		A54B7CC82C3645ED00BBA593 /* UatRelease */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = UatRelease;
+		};
+		A54B7CC92C3645ED00BBA593 /* UatRelease */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = B6BB01E4C5DB87B66F0ECE84 /* Pods-galaxy.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
+				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = RXHYW88XR7;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/galaxy/Res/Frameworks",
+					"$(PROJECT_DIR)/galaxy/Classes/Modules/AutoLogin(一键登录)/framework",
+				);
+				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = galaxy/Res/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "银河港生活-Uat";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
+				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
+				INFOPLIST_KEY_NSCameraUsageDescription = "APP需要您的同意，才能使用相机进行照片拍摄来完成信息填写，如禁止将无法拍摄照片，会影响资料提交效率。";
+				INFOPLIST_KEY_NSFileProviderDomainUsageDescription = "需要访问您的文件以选择和上传";
+				INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "APP需要您的同意，才能访问相册进行选择照片上传来完成信息填写，如禁止将无法上传选定图片，会影响资料提交效率。";
+				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
+				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
+				INFOPLIST_KEY_UIUserInterfaceStyle = Light;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 0.9.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = UATENV;
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
+			};
+			name = UatRelease;
+		};
+		A54B7CCA2C3645ED00BBA593 /* UatRelease */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 1;
+				GENERATE_INFOPLIST_FILE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.2;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/galaxy.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/galaxy";
+			};
+			name = UatRelease;
+		};
+		A54B7CCB2C3645ED00BBA593 /* UatRelease */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = "";
+				GENERATE_INFOPLIST_FILE = YES;
+				MARKETING_VERSION = 1.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.galaxy.cn.galaxyUITests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_TARGET_NAME = galaxy;
+			};
+			name = UatRelease;
+		};
 		A5573EF62B317C0100D98EC0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4118,6 +4275,7 @@
 			buildConfigurations = (
 				A5573EF62B317C0100D98EC0 /* Debug */,
 				A5573EF72B317C0100D98EC0 /* Release */,
+				A54B7CC82C3645ED00BBA593 /* UatRelease */,
 				A53B61132BB19B840010B573 /* TestEnv */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -4128,6 +4286,7 @@
 			buildConfigurations = (
 				A5573EF92B317C0100D98EC0 /* Debug */,
 				A5573EFA2B317C0100D98EC0 /* Release */,
+				A54B7CC92C3645ED00BBA593 /* UatRelease */,
 				A53B61142BB19B840010B573 /* TestEnv */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -4138,6 +4297,7 @@
 			buildConfigurations = (
 				A5573EFC2B317C0100D98EC0 /* Debug */,
 				A5573EFD2B317C0100D98EC0 /* Release */,
+				A54B7CCA2C3645ED00BBA593 /* UatRelease */,
 				A53B61152BB19B840010B573 /* TestEnv */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -4148,6 +4308,7 @@
 			buildConfigurations = (
 				A5573EFF2B317C0100D98EC0 /* Debug */,
 				A5573F002B317C0100D98EC0 /* Release */,
+				A54B7CCB2C3645ED00BBA593 /* UatRelease */,
 				A53B61162BB19B840010B573 /* TestEnv */,
 			);
 			defaultConfigurationIsVisible = 0;

--- 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"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A5573ECD2B317BFF00D98EC0"
+               BuildableName = "galaxy.app"
+               BlueprintName = "galaxy"
+               ReferencedContainer = "container:galaxy.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A5573ECD2B317BFF00D98EC0"
+            BuildableName = "galaxy.app"
+            BlueprintName = "galaxy"
+            ReferencedContainer = "container:galaxy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A5573ECD2B317BFF00D98EC0"
+            BuildableName = "galaxy.app"
+            BlueprintName = "galaxy"
+            ReferencedContainer = "container:galaxy.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
--- a/galaxy/galaxy/AppDelegate.swift
+++ b/galaxy/galaxy/AppDelegate.swift
@@ -166,13 +166,13 @@ extension AppDelegate {
        let v2 = YHNavigationController(rootVC:YHCommunityViewController())
        let v3 = YHNavigationController(rootVC:YHMyViewController())
        
-        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
+        v0.tabBarItem = ESTabBarItem.init(YHHomeLottieAnimateContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
        
-        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
+        v1.tabBarItem = ESTabBarItem.init(YHServiceLottieAnimateContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
        
-        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "社区", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
+        v2.tabBarItem = ESTabBarItem.init(YHCommunityLottieAnimateContentView(),title: "社区", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
        
-        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
+        v3.tabBarItem = ESTabBarItem.init(YHMyLottieAnimateContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
        
        tabBarController.viewControllers = [v0,v1,v2,v3]
        tabBarController.tabBar.backgroundColor = .white

--- a/galaxy/galaxy/Applegate(JPush).swift
+++ b/galaxy/galaxy/Applegate(JPush).swift
@@ -34,6 +34,8 @@ extension AppDelegate: JPUSHRegisterDelegate {
        let isProduction = false
 #elseif TESTENV
        let isProduction = true
+#elseif TESTENV
+        let isProduction = true
 #else
        let isProduction = true
 #endif
@@ -49,14 +51,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
        print("deviceToken:\(deviceTokenStr)")
        JPUSHService.registerDeviceToken(deviceToken)
        YHLoginManager.shared.deviceTokenModel.deviceToken = deviceTokenStr
-        
-
-#if DEBUG
-//        YHHUD.flash(message: deviceTokenStr)
-#elseif TESTENV
-//        YHHUD.flash(message: deviceTokenStr)
-#else
-#endif
    }
    //获取token 失败
    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { //可选

--- a/galaxy/galaxy/Classes/Base/V/YHBasicContentView.swift
+++ b/galaxy/galaxy/Classes/Base/V/YHBasicContentView.swift
@@ -8,6 +8,7 @@

 import UIKit
 import ESTabBarController_swift
+import Lottie

 class YHBasicContentView: ESTabBarItemContentView {

@@ -29,3 +30,173 @@ class YHBasicContentView: ESTabBarItemContentView {
    

 }
+
+class YHHomeLottieAnimateContentView: YHBasicContentView {
+
+    let lottieView: LottieAnimationView! = {
+        let lottieView = LottieAnimationView(name: "home")
+        lottieView.loopMode = .playOnce
+        lottieView.contentMode = .scaleAspectFit
+        lottieView.isHidden = true
+        return lottieView
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.addSubview(lottieView)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func updateLayout() {
+        super.updateLayout()
+        lottieView.snp.makeConstraints { make in
+            make.height.width.equalTo(25)
+            make.center.equalTo(self.imageView.snp.center)
+        }
+    }
+    
+    override func selectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.selectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = false
+        imageView.isHidden = true
+        lottieView.play { completed in
+            self.imageView.isHidden = false
+        }
+    }
+    
+    override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.deselectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = true
+    }
+
+}
+
+class YHServiceLottieAnimateContentView: YHBasicContentView {
+
+    let lottieView: LottieAnimationView! = {
+        let lottieView = LottieAnimationView(name: "service")
+        lottieView.loopMode = .playOnce
+        lottieView.contentMode = .scaleAspectFit
+        lottieView.isHidden = true
+        return lottieView
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.addSubview(lottieView)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func updateLayout() {
+        super.updateLayout()
+        lottieView.snp.makeConstraints { make in
+            make.height.width.equalTo(25)
+            make.center.equalTo(self.imageView.snp.center)
+        }
+    }
+    
+    override func selectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.selectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = false
+        imageView.isHidden = true
+        lottieView.play { completed in
+            self.imageView.isHidden = false
+        }
+    }
+    
+    override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.deselectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = true
+    }
+}
+
+class YHCommunityLottieAnimateContentView: YHBasicContentView {
+
+    let lottieView: LottieAnimationView! = {
+        let lottieView = LottieAnimationView(name: "community")
+        lottieView.loopMode = .playOnce
+        lottieView.contentMode = .scaleAspectFit
+        lottieView.isHidden = true
+        return lottieView
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.addSubview(lottieView)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func updateLayout() {
+        super.updateLayout()
+        lottieView.snp.makeConstraints { make in
+            make.height.width.equalTo(25)
+            make.center.equalTo(self.imageView.snp.center)
+        }
+    }
+    
+    override func selectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.selectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = false
+        imageView.isHidden = true
+        lottieView.play { completed in
+            self.imageView.isHidden = false
+        }
+    }
+    
+    override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.deselectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = true
+    }
+
+}
+
+class YHMyLottieAnimateContentView: YHBasicContentView {
+
+    let lottieView: LottieAnimationView! = {
+        let lottieView = LottieAnimationView(name: "my")
+        lottieView.loopMode = .playOnce
+        lottieView.contentMode = .scaleAspectFit
+        lottieView.isHidden = true
+        return lottieView
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.addSubview(lottieView)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func updateLayout() {
+        super.updateLayout()
+        lottieView.snp.makeConstraints { make in
+            make.height.width.equalTo(25)
+            make.center.equalTo(self.imageView.snp.center)
+        }
+    }
+    
+    override func selectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.selectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = false
+        imageView.isHidden = true
+        lottieView.play { completed in
+            self.imageView.isHidden = false
+        }
+    }
+    
+    override func deselectAnimation(animated: Bool, completion: (() -> ())?) {
+        super.deselectAnimation(animated: animated, completion: nil)
+        lottieView.isHidden = true
+    }
+}
--- a/galaxy/galaxy/Classes/Modules/Home(首页)/C/YHConfigManager.swift
+++ b/galaxy/galaxy/Classes/Modules/Home(首页)/C/YHConfigManager.swift
@@ -36,6 +36,8 @@ class YHConfigManager: NSObject {
            tH5url = YHConfigManager.baseH5UrlTest
 #elseif TESTENV
            tH5url = YHConfigManager.baseH5UrlTest
+#elseif UATENV
+            tH5url = YHConfigManager.baseH5UrlRelease
 #else
            tH5url = YHConfigManager.baseH5UrlRelease
 #endif
@@ -60,6 +62,8 @@ class YHConfigManager: NSObject {
            tOssUrl = YHConfigManager.baseOSSUrlTest
 #elseif TESTENV
            tOssUrl = YHConfigManager.baseOSSUrlTest
+#elseif UATENV
+            tOssUrl = YHConfigManager.baseOSSUrlRelease
 #else
            tOssUrl = YHConfigManager.baseOSSUrlRelease
 #endif

--- a/galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift
+++ b/galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStartPageViewController.swift
@@ -180,13 +180,13 @@ private extension YHStartPageViewController {
        let v2 = YHNavigationController(rootVC:YHCommunityViewController())
        let v3 = YHNavigationController(rootVC:YHMyViewController())
        
-        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
+        v0.tabBarItem = ESTabBarItem.init(YHHomeLottieAnimateContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
        
-        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
+        v1.tabBarItem = ESTabBarItem.init(YHServiceLottieAnimateContentView(),title: "服务", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
        
-        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "社区", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
+        v2.tabBarItem = ESTabBarItem.init(YHCommunityLottieAnimateContentView(),title: "社区", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
        
-        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
+        v3.tabBarItem = ESTabBarItem.init(YHMyLottieAnimateContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
        
        tabBarController.viewControllers = [v0,v1,v2,v3]
        tabBarController.tabBar.backgroundColor = .white

--- a/galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
+++ b/galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
@@ -82,6 +82,14 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
                PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
+#elseif UATENV
+        return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
+                PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
+                PersonalModuleItem(title: "播放设置".local, type:.playSettings),
+                PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
+                PersonalModuleItem(title: "用户条款".local, type:.userItems),
+                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
+                PersonalModuleItem(title: "版本 \(myVer)",isShowRedPoint:isShowVersionRedPoint, type:.version)]
 #else
        return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                PersonalModuleItem(title: "权限设置".local, type:.permissionSettings),
@@ -141,8 +149,12 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
 #elseif TESTENV
        let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
        versionLabel.text = version
+#elseif UATENV
+        let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "Uat服"
+        versionLabel.text = version
+        versionLabel.isHidden = true
 #else
-        let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
+        let version = "版本号：V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "正式服"
        versionLabel.text = version
        versionLabel.isHidden = true
 #endif

--- a/galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift
+++ b/galaxy/galaxy/Classes/Tools/Analytics/YHAnalytics.swift
@@ -24,6 +24,12 @@ class YHAnalytics {
        //开启log
        options.enableLog = true
        SensorsAnalyticsSDK.sharedInstance()?.set(["evn" : "test"])
+        
+#elseif UATENV
+        let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForRelease, launchOptions: launchOptions)
+        //开启log
+        options.enableLog = false
+        SensorsAnalyticsSDK.sharedInstance()?.set(["evn" : "uat"])
 #else
        let options = SAConfigOptions.init(serverURL: YhConstant.SensorsAnalytics.urlForRelease, launchOptions: launchOptions)
        //开启log

--- a/galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
+++ b/galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
@@ -12,21 +12,22 @@ class YHBaseUrlManager {
    static let shared = YHBaseUrlManager()
    
    //测试环境
-    static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com" //APP 使用域名
+    static let baseUrlForTest : String = "https://test-app-go-api.galaxy-immi.com" //APP 使用域名
    //正式环境
-    static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com"
+    static let baseUrlForRelease : String = "https://app-go-api.galaxy-immi.com"
    // UAT灰度环境
-    static let baseUatUrlTest: String = "https://uat-go-api.galaxy-immi.com"
+    static let baseUrlForUat: String = "https://uat-go-api.galaxy-immi.com"
    
    
    func curURL() -> String {
 #if DEBUG
-        return YHBaseUrlManager.baseUrlTest + "/"
+        return YHBaseUrlManager.baseUrlForTest + "/"
 #elseif TESTENV
-//        return YHBaseUrlManager.baseUatUrlTest + "/"
-        return YHBaseUrlManager.baseUrlTest + "/"
+        return YHBaseUrlManager.baseUrlForTest + "/"
+#elseif UATENV
+        return YHBaseUrlManager.baseUrlForUat + "/"
 #else
-        return YHBaseUrlManager.baseUrlRelease + "/"
+        return YHBaseUrlManager.baseUrlForRelease + "/"
 #endif
    }
    

--- a/galaxy/galaxy/Res/jsons/community.json
+++ b/galaxy/galaxy/Res/jsons/community.json
+{"v":"5.6.10","fr":30,"ip":0,"op":25,"w":100,"h":100,"nm":"社区","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"内线 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":16,"s":[50,30,0],"to":[0,4.333,0],"ti":[0,-4.333,0]},{"t":25,"s":[50,56,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.684,0],[-0.401,1.15]],"o":[[0.401,1.15],[1.684,0],[0,0]],"v":[[-3.5,-1],[0,1],[3.5,-1]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":16,"s":[0]},{"t":25,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"外线2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,51.25,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.085,6.964],[-3.085,6.965]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0.635],[0,0],[0.635,0],[0,0],[0,-0.635],[0,0],[-0.635,0],[0,0],[0,0],[-0.409,0.38],[0,0],[0,0]],"o":[[0,0],[0,-0.635],[0,0],[-0.635,0],[0,0],[0,0.635],[0,0],[0,0],[0.445,0.336],[0,0],[0,0],[0.635,0]],"v":[[8.65,5.845],[8.65,-7],[7.5,-8.15],[-7.5,-8.15],[-8.65,-7],[-8.65,5.845],[-7.5,6.995],[-3.045,6.995],[-0.7,8.766],[0.776,8.691],[2.601,6.995],[7.5,6.995]],"c":true},"ix":2},"nm":"路径 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"内线","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,56,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.684,0],[-0.401,1.15]],"o":[[0.401,1.15],[1.684,0],[0,0]],"v":[[-3.5,-1],[0,1],[3.5,-1]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":10,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"外线","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,51.924,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0.635],[0,0],[0.635,0],[0,0],[0,-0.635],[0,0],[-0.635,0],[0,0],[0,0],[-0.409,0.38],[0,0],[0,0]],"o":[[0,0],[0,-0.635],[0,0],[-0.635,0],[0,0],[0,0.635],[0,0],[0,0],[0.445,0.336],[0,0],[0,0],[0.635,0]],"v":[[8.65,5.421],[8.65,-7.424],[7.5,-8.574],[-7.5,-8.574],[-8.65,-7.424],[-8.65,5.421],[-7.5,6.571],[-3.045,6.571],[-0.7,8.342],[0.776,8.267],[2.601,6.571],[7.5,6.571]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
--- a/galaxy/galaxy/Res/jsons/home.json
+++ b/galaxy/galaxy/Res/jsons/home.json
+{"v":"5.6.10","fr":30,"ip":0,"op":25,"w":100,"h":100,"nm":"首页","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"线 3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[0]},{"t":10,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[50,90.188,0],"to":[0,-3.417,0],"ti":[0,3.417,0]},{"t":25,"s":[50,69.688,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.5,0],[2.5,0]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"线","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[100]},{"t":10,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,67.938,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.5,0],[2.5,0]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"房子","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,49.61,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-0.539],[0,0],[-0.911,0],[0,0],[0,0.911],[0,0],[0.442,0.309],[0,0],[0.567,-0.396],[0,0]],"o":[[-0.442,0.309],[0,0],[0,0.911],[0,0],[0.911,0],[0,0],[0,-0.539],[0,0],[-0.567,-0.396],[0,0],[0,0]],"v":[[-7.444,-3.71],[-8.15,-2.357],[-8.15,6.89],[-6.5,8.54],[6.5,8.54],[8.15,6.89],[8.15,-2.357],[7.444,-3.71],[0.944,-8.244],[-0.944,-8.244],[-7.444,-3.71]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":180,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"房子 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"t":17,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,49.61,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[398,398,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-0.539],[0,0],[-0.911,0],[0,0],[0,0.911],[0,0],[0.442,0.309],[0,0],[0.567,-0.396],[0,0]],"o":[[-0.442,0.309],[0,0],[0,0.911],[0,0],[0.911,0],[0,0],[0,-0.539],[0,0],[-0.567,-0.396],[0,0],[0,0]],"v":[[-7.444,-3.71],[-8.15,-2.357],[-8.15,6.89],[-6.5,8.54],[6.5,8.54],[8.15,6.89],[8.15,-2.357],[7.444,-3.71],[0.944,-8.244],[-0.944,-8.244],[-7.444,-3.71]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":180,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
--- a/galaxy/galaxy/Res/jsons/my.json
+++ b/galaxy/galaxy/Res/jsons/my.json
+{"v":"5.6.10","fr":30,"ip":0,"op":25,"w":100,"h":100,"nm":"我的","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"上线2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[0]},{"t":25,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[50,64,0],"to":[0,-5,0],"ti":[0,5,0]},{"t":25,"s":[50,34,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":15,"s":[50,50,100]},{"t":25,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[9.941,0],[0,9.941],[-9.941,0],[0,-9.941]],"o":[[-9.941,0],[0,-9.941],[9.941,0],[0,9.941]],"v":[[0,18],[-18,0],[0,-18],[18,0]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"下线2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"t":17,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,74,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.825,0],[0,0],[0,-10.825],[-0.221,0],[0,0],[0,0.221]],"o":[[0,0],[-10.825,0],[0,0.221],[0,0],[0.221,0],[0,-10.825]],"v":[[14.4,-10],[-14.4,-10],[-34,9.6],[-33.6,10],[33.6,10],[34,9.6]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"上线","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,34,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[9.941,0],[0,9.941],[-9.941,0],[0,-9.941]],"o":[[-9.941,0],[0,-9.941],[9.941,0],[0,9.941]],"v":[[0,18],[-18,0],[0,-18],[18,0]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":10,"s":[0]}],"ix":1},"e":{"a":0,"k":0,"ix":2},"o":{"a":0,"k":-54,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"下线","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,74,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[10.825,0],[0,0],[0,-10.825],[-0.221,0],[0,0],[0,0.221]],"o":[[0,0],[-10.825,0],[0,0.221],[0,0],[0.221,0],[0,-10.825]],"v":[[14.4,-10],[-14.4,-10],[-34,9.6],[-33.6,10],[33.6,10],[34,9.6]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588238537,0.101960785687,0.149019613862,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":-72,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
--- a/galaxy/galaxy/Res/jsons/service.json
+++ b/galaxy/galaxy/Res/jsons/service.json
+{"v":"5.6.10","fr":30,"ip":0,"op":25,"w":100,"h":100,"nm":"服务","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"下线 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[50,48,0],"to":[0,1.667,0],"ti":[0,-1.667,0]},{"t":25,"s":[50,58,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,8],[0,-8]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[100]},{"t":25,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"右线 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[57,36,0],"to":[0,1.667,0],"ti":[0,-1.667,0]},{"t":25,"s":[57,46,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7,-4],[-7,4]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[100]},{"t":25,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"左线 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.333,"y":0},"t":15,"s":[43,36,0],"to":[0,1.667,0],"ti":[0,-1.667,0]},{"t":25,"s":[43,46,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7,-4],[7,4]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":15,"s":[100]},{"t":25,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"左线","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[100]},{"t":17,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[43,46,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-7,-4],[7,4]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"右线","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[100]},{"t":17,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[57,46,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[7,-4],[-7,4]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"下线","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[100]},{"t":17,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,58,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,8],[0,-8]],"c":false},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"六边形2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[0]},{"t":17,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,2.438],[0,0],[2.151,1.147],[0,0],[1.941,-1.035],[0,0],[0,-2.438],[0,0],[-2.151,-1.147],[0,0],[-1.941,1.035],[0,0]],"o":[[0,0],[0,-2.438],[0,0],[-1.941,-1.035],[0,0],[-2.151,1.147],[0,0],[0,2.438],[0,0],[1.941,1.035],[0,0],[2.151,-1.147]],"v":[[32.6,15.6],[32.6,-15.6],[29.106,-21.424],[3.106,-35.29],[-3.106,-35.29],[-29.106,-21.424],[-32.6,-15.6],[-32.6,15.6],[-29.106,21.423],[-3.106,35.29],[3.106,35.29],[29.106,21.423]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":25,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"六边形","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,2.438],[0,0],[2.151,1.147],[0,0],[1.941,-1.035],[0,0],[0,-2.438],[0,0],[-2.151,-1.147],[0,0],[-1.941,1.035],[0,0]],"o":[[0,0],[0,-2.438],[0,0],[-1.941,-1.035],[0,0],[-2.151,1.147],[0,0],[0,2.438],[0,0],[1.941,1.035],[0,0],[2.151,-1.147]],"v":[[32.6,15.6],[32.6,-15.6],[29.106,-21.424],[3.106,-35.29],[-3.106,-35.29],[-29.106,-21.424],[-32.6,-15.6],[-32.6,15.6],[-29.106,21.423],[-3.106,35.29],[3.106,35.29],[29.106,21.423]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.070588235294,0.101960784314,0.149019607843,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":5.2,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"组 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"修剪路径 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":25,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file