合并修改冲突

PhoneManager.xcodeproj/project.pbxproj

@@ -251,23 +251,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		31462A82044E900B1963FE3A /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-PhoneManager/Pods-PhoneManager-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-PhoneManager/Pods-PhoneManager-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-PhoneManager/Pods-PhoneManager-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		594FD43819933850E07C4C9C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

PhoneManager/Class/Session/Home/HomeViewController.swift

@@ -57,6 +57,8 @@ class HomeViewController:BaseViewController {
                     DispatchQueue.main.async { [weak self] in
                         guard let self else {return}
                         let vc:SecretViewController = SecretViewController()
+                        self.navigationController?.pushViewController(vc, animated: true)
+                    }
                 case 2 :
                     DispatchQueue.main.async {[weak self] in
                         guard let self else {return}