Skip to content

Commit c72e6e8

Browse files
ckkenckken
authored
Merge pull request #40 from efoxTeam/dev
fix:完成ios firebase接入
2 parents 4732aa4 + 0fa3b5c commit c72e6e8

File tree

8 files changed

+143
-9
lines changed

8 files changed

+143
-9
lines changed

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 69 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
1413
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -20,6 +19,8 @@
2019
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
2120
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
2221
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
22+
BA61DFEF7B89A2B0064AE279 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D7BE9010C4F7FF033BA299B7 /* libPods-Runner.a */; };
23+
BEBBA522223FEA6600583D52 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = BEBBA521223FEA6600583D52 /* GoogleService-Info.plist */; };
2324
/* End PBXBuildFile section */
2425

2526
/* Begin PBXCopyFilesBuildPhase section */
@@ -40,7 +41,6 @@
4041
/* Begin PBXFileReference section */
4142
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4243
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
43-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
4444
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
4545
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4646
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -55,6 +55,8 @@
5555
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5656
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5757
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
58+
BEBBA521223FEA6600583D52 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
59+
D7BE9010C4F7FF033BA299B7 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5860
/* End PBXFileReference section */
5961

6062
/* Begin PBXFrameworksBuildPhase section */
@@ -64,16 +66,31 @@
6466
files = (
6567
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
6668
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
69+
BA61DFEF7B89A2B0064AE279 /* libPods-Runner.a in Frameworks */,
6770
);
6871
runOnlyForDeploymentPostprocessing = 0;
6972
};
7073
/* End PBXFrameworksBuildPhase section */
7174

7275
/* Begin PBXGroup section */
76+
607E308685FBC1196333D679 /* Frameworks */ = {
77+
isa = PBXGroup;
78+
children = (
79+
D7BE9010C4F7FF033BA299B7 /* libPods-Runner.a */,
80+
);
81+
name = Frameworks;
82+
sourceTree = "<group>";
83+
};
84+
8B5D251E963699100C93BD5E /* Pods */ = {
85+
isa = PBXGroup;
86+
children = (
87+
);
88+
name = Pods;
89+
sourceTree = "<group>";
90+
};
7391
9740EEB11CF90186004384FC /* Flutter */ = {
7492
isa = PBXGroup;
7593
children = (
76-
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
7794
3B80C3931E831B6300D905FE /* App.framework */,
7895
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
7996
9740EEBA1CF902C7004384FC /* Flutter.framework */,
@@ -90,7 +107,8 @@
90107
9740EEB11CF90186004384FC /* Flutter */,
91108
97C146F01CF9000F007C117D /* Runner */,
92109
97C146EF1CF9000F007C117D /* Products */,
93-
CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
110+
8B5D251E963699100C93BD5E /* Pods */,
111+
607E308685FBC1196333D679 /* Frameworks */,
94112
);
95113
sourceTree = "<group>";
96114
};
@@ -105,6 +123,7 @@
105123
97C146F01CF9000F007C117D /* Runner */ = {
106124
isa = PBXGroup;
107125
children = (
126+
BEBBA521223FEA6600583D52 /* GoogleService-Info.plist */,
108127
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
109128
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
110129
97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -133,12 +152,14 @@
133152
isa = PBXNativeTarget;
134153
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
135154
buildPhases = (
155+
9C2B8B9B587696DA01082626 /* [CP] Check Pods Manifest.lock */,
136156
9740EEB61CF901F6004384FC /* Run Script */,
137157
97C146EA1CF9000F007C117D /* Sources */,
138158
97C146EB1CF9000F007C117D /* Frameworks */,
139159
97C146EC1CF9000F007C117D /* Resources */,
140160
9705A1C41CF9048500538489 /* Embed Frameworks */,
141161
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
162+
EB6D2D2E068567EE260A8427 /* [CP] Embed Pods Frameworks */,
142163
);
143164
buildRules = (
144165
);
@@ -160,6 +181,7 @@
160181
TargetAttributes = {
161182
97C146ED1CF9000F007C117D = {
162183
CreatedOnToolsVersion = 7.3.1;
184+
DevelopmentTeam = 5K9P57YFSL;
163185
};
164186
};
165187
};
@@ -190,8 +212,8 @@
190212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
191213
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
192214
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
193-
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
194215
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
216+
BEBBA522223FEA6600583D52 /* GoogleService-Info.plist in Resources */,
195217
);
196218
runOnlyForDeploymentPostprocessing = 0;
197219
};
@@ -226,6 +248,42 @@
226248
shellPath = /bin/sh;
227249
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
228250
};
251+
9C2B8B9B587696DA01082626 /* [CP] Check Pods Manifest.lock */ = {
252+
isa = PBXShellScriptBuildPhase;
253+
buildActionMask = 2147483647;
254+
files = (
255+
);
256+
inputPaths = (
257+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
258+
"${PODS_ROOT}/Manifest.lock",
259+
);
260+
name = "[CP] Check Pods Manifest.lock";
261+
outputPaths = (
262+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
263+
);
264+
runOnlyForDeploymentPostprocessing = 0;
265+
shellPath = /bin/sh;
266+
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";
267+
showEnvVarsInLog = 0;
268+
};
269+
EB6D2D2E068567EE260A8427 /* [CP] Embed Pods Frameworks */ = {
270+
isa = PBXShellScriptBuildPhase;
271+
buildActionMask = 2147483647;
272+
files = (
273+
);
274+
inputPaths = (
275+
"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
276+
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
277+
);
278+
name = "[CP] Embed Pods Frameworks";
279+
outputPaths = (
280+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
281+
);
282+
runOnlyForDeploymentPostprocessing = 0;
283+
shellPath = /bin/sh;
284+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
285+
showEnvVarsInLog = 0;
286+
};
229287
/* End PBXShellScriptBuildPhase section */
230288

231289
/* Begin PBXSourcesBuildPhase section */
@@ -315,7 +373,7 @@
315373
buildSettings = {
316374
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
317375
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
318-
DEVELOPMENT_TEAM = S8QB4VV633;
376+
DEVELOPMENT_TEAM = 5K9P57YFSL;
319377
ENABLE_BITCODE = NO;
320378
FRAMEWORK_SEARCH_PATHS = (
321379
"$(inherited)",
@@ -327,7 +385,7 @@
327385
"$(inherited)",
328386
"$(PROJECT_DIR)/Flutter",
329387
);
330-
PRODUCT_BUNDLE_IDENTIFIER = com.example.efoxFlutter;
388+
PRODUCT_BUNDLE_IDENTIFIER = com.flutter.beer;
331389
PRODUCT_NAME = "$(TARGET_NAME)";
332390
VERSIONING_SYSTEM = "apple-generic";
333391
};
@@ -441,6 +499,7 @@
441499
buildSettings = {
442500
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
443501
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
502+
DEVELOPMENT_TEAM = 5K9P57YFSL;
444503
ENABLE_BITCODE = NO;
445504
FRAMEWORK_SEARCH_PATHS = (
446505
"$(inherited)",
@@ -452,7 +511,7 @@
452511
"$(inherited)",
453512
"$(PROJECT_DIR)/Flutter",
454513
);
455-
PRODUCT_BUNDLE_IDENTIFIER = com.example.efoxFlutter;
514+
PRODUCT_BUNDLE_IDENTIFIER = com.flutter.beer;
456515
PRODUCT_NAME = "$(TARGET_NAME)";
457516
VERSIONING_SYSTEM = "apple-generic";
458517
};
@@ -464,6 +523,7 @@
464523
buildSettings = {
465524
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
466525
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
526+
DEVELOPMENT_TEAM = 5K9P57YFSL;
467527
ENABLE_BITCODE = NO;
468528
FRAMEWORK_SEARCH_PATHS = (
469529
"$(inherited)",
@@ -475,7 +535,7 @@
475535
"$(inherited)",
476536
"$(PROJECT_DIR)/Flutter",
477537
);
478-
PRODUCT_BUNDLE_IDENTIFIER = com.example.efoxFlutter;
538+
PRODUCT_BUNDLE_IDENTIFIER = com.flutter.beer;
479539
PRODUCT_NAME = "$(TARGET_NAME)";
480540
VERSIONING_SYSTEM = "apple-generic";
481541
};

‎ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎ios/Runner.xcworkspace/contents.xcworkspacedata

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildSystemType</key>
6+
<string>Original</string>
7+
</dict>
8+
</plist>

‎ios/Runner/AppDelegate.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
#include "AppDelegate.h"
22
#include "GeneratedPluginRegistrant.h"
33

4+
@import Firebase;//增加 firebase 支持
5+
46
@implementation AppDelegate
57

68
- (BOOL)application:(UIApplication *)application
79
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
10+
11+
[FIRApp configure];//增加 firebase 支持
12+
813
[GeneratedPluginRegistrant registerWithRegistry:self];
914
// Override point for customization after application launch.
1015
return [super application:application didFinishLaunchingWithOptions:launchOptions];

‎ios/Runner/GoogleService-Info.plist

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>AD_UNIT_ID_FOR_BANNER_TEST</key>
6+
<string>ca-app-pub-3940256099942544/2934735716</string>
7+
<key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
8+
<string>ca-app-pub-3940256099942544/4411468910</string>
9+
<key>CLIENT_ID</key>
10+
<string>27281760426-agmn2b0f4dr988t098rm5259v7i7cbkf.apps.googleusercontent.com</string>
11+
<key>REVERSED_CLIENT_ID</key>
12+
<string>com.googleusercontent.apps.27281760426-agmn2b0f4dr988t098rm5259v7i7cbkf</string>
13+
<key>API_KEY</key>
14+
<string>AIzaSyBUOZNJqMvIF_QEJGHXu0ponVCGPo5YarI</string>
15+
<key>GCM_SENDER_ID</key>
16+
<string>27281760426</string>
17+
<key>PLIST_VERSION</key>
18+
<string>1</string>
19+
<key>BUNDLE_ID</key>
20+
<string>com.flutter.beer</string>
21+
<key>PROJECT_ID</key>
22+
<string>efox-flutter</string>
23+
<key>STORAGE_BUCKET</key>
24+
<string>efox-flutter.appspot.com</string>
25+
<key>IS_ADS_ENABLED</key>
26+
<true></true>
27+
<key>IS_ANALYTICS_ENABLED</key>
28+
<false></false>
29+
<key>IS_APPINVITE_ENABLED</key>
30+
<false></false>
31+
<key>IS_GCM_ENABLED</key>
32+
<true></true>
33+
<key>IS_SIGNIN_ENABLED</key>
34+
<true></true>
35+
<key>GOOGLE_APP_ID</key>
36+
<string>1:27281760426:ios:51548b1d738060a2</string>
37+
<key>DATABASE_URL</key>
38+
<string>https://efox-flutter.firebaseio.com</string>
39+
</dict>
40+
</plist>

‎ios/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
66
<string>en</string>
7+
<key>CFBundleDisplayName</key>
8+
<string>flutter ui</string>
79
<key>CFBundleExecutable</key>
810
<string>$(EXECUTABLE_NAME)</string>
911
<key>CFBundleIdentifier</key>

0 commit comments

Comments
 (0)