Browse Source

Merge branch 'v1.0.0_ios' of http://git.atmob.com:28999/Atmob-Flutter/AiKeyboard2025 into v1.0.0_ios

# Conflicts:
#	ios/AiKeyboard/Info.plist
#	ios/AiKeyboard/KeyboardViewController.swift
#	ios/AiKeyboard/Network/KeyboardApi.swift
#	ios/AiKeyboard/View/PopView/KeyboardLoginTipView.swift
#	ios/AiKeyboard/View/PopView/KeyboardMenuView.swift
#	ios/KeyboardSharedDataManager.swift
#	ios/Podfile
#	ios/Podfile.lock
#	ios/Runner.xcodeproj/xcshareddata/xcschemes/AiKeyboard.xcscheme
#	ios/Runner/Info.plist
#	ios/Runner/Runner.entitlements
#	lib/module/mine/mine_controller.dart
#	pubspec.yaml
Destiny 7 months ago
parent
commit
963bde09c4
2 changed files with 40 additions and 1 deletions
  1. 39 0
      ios/Runner.xcodeproj/project.pbxproj
  2. 1 1
      lib/data/consts/constants.dart

+ 39 - 0
ios/Runner.xcodeproj/project.pbxproj

@@ -680,6 +680,45 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		C84FD05E1687413028FE5569 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			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;
+		};
+		EADF2BA47287E2D0EA1688E0 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

+ 1 - 1
lib/data/consts/constants.dart

@@ -3,7 +3,7 @@ import '../../utils/mmkv_util.dart';
 class Constants {
   Constants._();
 
-  static const String env = envProd;
+  static const String env = envTest;
 
   static const String envDev = 'dev';