diff --git a/android/app/build.gradle b/android/app/build.gradle
index d3038cdf..b548dd94 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -58,4 +58,18 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ //firebase
+ implementation 'com.google.firebase:firebase-core:16.0.8'
+ //Crashlytics SDK
+ implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
+ // 性能监控
+ ///implementation 'com.google.firebase:firebase-perf:16.2.3'
+ // 登陆
+ ////implementation 'com.google.firebase:firebase-auth:16.0.3'
}
+//firebase
+apply plugin: 'com.google.gms.google-services'
+//Crashlytics SDK
+apply plugin: 'io.fabric'
+// 性能监控
+///apply plugin: 'com.google.firebase.firebase-perf'
\ No newline at end of file
diff --git a/android/app/google-services.json b/android/app/google-services.json
new file mode 100644
index 00000000..22b356f0
--- /dev/null
+++ b/android/app/google-services.json
@@ -0,0 +1,42 @@
+{
+ "project_info": {
+ "project_number": "958876143057",
+ "firebase_url": "https://flutter-go-421b4.firebaseio.com",
+ "project_id": "flutter-go-421b4",
+ "storage_bucket": "flutter-go-421b4.appspot.com"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:958876143057:android:00e8533fa0274183",
+ "android_client_info": {
+ "package_name": "com.ali.fluttergo"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "958876143057-maa2o9gk35r67d3dbn1gjilpg4ukac71.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyAfYEa2NfytIA-Rdc_K4F-iufgXQ6Lz5ZI"
+ }
+ ],
+ "services": {
+ "analytics_service": {
+ "status": 1
+ },
+ "appinvite_service": {
+ "status": 1,
+ "other_platform_oauth_client": []
+ },
+ "ads_service": {
+ "status": 2
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index e81b1a1d..8cb8f7fe 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,10 +2,20 @@ buildscript {
repositories {
google()
jcenter()
+ //Crashlytics SDK
+ maven {
+ url 'https://maven.fabric.io/public'
+ }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.0'
+ //firebase
+ classpath 'com.google.gms:google-services:4.2.0'
+ //Crashlytics SDK
+ classpath 'io.fabric.tools:gradle:1.26.1'
+ // 性能监控
+ ///classpath 'com.google.firebase:firebase-plugins:1.1.5'
}
}
@@ -13,6 +23,10 @@ allprojects {
repositories {
google()
jcenter()
+ //Crashlytics SDK
+ maven {
+ url 'https://maven.google.com/'
+ }
}
}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 03824124..c2bcac0e 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 8c3f0e89..f458f3aa 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+ 94722E5C22511D3600F63900 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94722E5B22511D3600F63900 /* GoogleService-Info.plist */; };
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
@@ -78,6 +79,7 @@
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+ 94722E5B22511D3600F63900 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
@@ -87,6 +89,8 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+ A9941E6EA19A9CEF6B117A70 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+ CBA6E34746642008D95A119D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
DDA792F029EDD7A11295D192 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@@ -129,6 +133,8 @@
0C172CA58CDB230D5DA80034 /* Pods */ = {
isa = PBXGroup;
children = (
+ CBA6E34746642008D95A119D /* Pods-Runner.debug.xcconfig */,
+ A9941E6EA19A9CEF6B117A70 /* Pods-Runner.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
@@ -178,6 +184,7 @@
97C146F01CF9000F007C117D /* Runner */ = {
isa = PBXGroup;
children = (
+ 94722E5B22511D3600F63900 /* GoogleService-Info.plist */,
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */,
97C146FA1CF9000F007C117D /* Main.storyboard */,
@@ -282,6 +289,7 @@
0828E49B220692B500A59437 /* iPad Landscape@2x.png in Resources */,
0828E495220692B500A59437 /* iPhone Portrait-Retina 4.png in Resources */,
0828E498220692B500A59437 /* iPhone XS Max Portrait.png in Resources */,
+ 94722E5C22511D3600F63900 /* GoogleService-Info.plist in Resources */,
0828E496220692B500A59437 /* iPad Portrait.png in Resources */,
0828E49C220692B500A59437 /* iPhone Landscape-Retina HD 5.5.png in Resources */,
);
@@ -309,15 +317,11 @@
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",
);
@@ -345,21 +349,17 @@
buildActionMask = 2147483647;
files = (
);
- inputFileListPaths = (
- );
inputPaths = (
- "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+ "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
);
name = "[CP] Embed Pods Frameworks";
- outputFileListPaths = (
- );
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -522,7 +522,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.ali.flutterRookieBook;
+ PRODUCT_BUNDLE_IDENTIFIER = com.ali.fluttergo;
PRODUCT_NAME = "$(TARGET_NAME)";
VERSIONING_SYSTEM = "apple-generic";
};
@@ -547,7 +547,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.ali.flutterRookieBook;
+ PRODUCT_BUNDLE_IDENTIFIER = com.ali.fluttergo;
PRODUCT_NAME = "$(TARGET_NAME)";
VERSIONING_SYSTEM = "apple-generic";
};
diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m
index 7feb3d13..7474c39b 100644
--- a/ios/Runner/AppDelegate.m
+++ b/ios/Runner/AppDelegate.m
@@ -1,10 +1,15 @@
#include "AppDelegate.h"
#include "GeneratedPluginRegistrant.h"
+@import Firebase;//增加 firebase 支持
+
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+ [FIRApp configure];//增加 firebase 支持
+
[GeneratedPluginRegistrant registerWithRegistry:self];
// Override point for customization after application launch.
[NSThread sleepForTimeInterval:2];
diff --git a/ios/Runner/GoogleService-Info.plist b/ios/Runner/GoogleService-Info.plist
new file mode 100644
index 00000000..2c32fe6f
--- /dev/null
+++ b/ios/Runner/GoogleService-Info.plist
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>AD_UNIT_ID_FOR_BANNER_TEST</key>
+ <string>ca-app-pub-3940256099942544/2934735716</string>
+ <key>AD_UNIT_ID_FOR_INTERSTITIAL_TEST</key>
+ <string>ca-app-pub-3940256099942544/4411468910</string>
+ <key>CLIENT_ID</key>
+ <string>958876143057-v6bp8g0p6dflvlk38qmbngt5pmon8sfs.apps.googleusercontent.com</string>
+ <key>REVERSED_CLIENT_ID</key>
+ <string>com.googleusercontent.apps.958876143057-v6bp8g0p6dflvlk38qmbngt5pmon8sfs</string>
+ <key>API_KEY</key>
+ <string>AIzaSyDbNj43LaECfyAEebrEkAN_ZcvmmOitwTY</string>
+ <key>GCM_SENDER_ID</key>
+ <string>958876143057</string>
+ <key>PLIST_VERSION</key>
+ <string>1</string>
+ <key>BUNDLE_ID</key>
+ <string>com.ali.fluttergo</string>
+ <key>PROJECT_ID</key>
+ <string>flutter-go-421b4</string>
+ <key>STORAGE_BUCKET</key>
+ <string>flutter-go-421b4.appspot.com</string>
+ <key>IS_ADS_ENABLED</key>
+ <true></true>
+ <key>IS_ANALYTICS_ENABLED</key>
+ <false></false>
+ <key>IS_APPINVITE_ENABLED</key>
+ <false></false>
+ <key>IS_GCM_ENABLED</key>
+ <true></true>
+ <key>IS_SIGNIN_ENABLED</key>
+ <true></true>
+ <key>GOOGLE_APP_ID</key>
+ <string>1:958876143057:ios:00e8533fa0274183</string>
+ <key>DATABASE_URL</key>
+ <string>https://flutter-go-421b4.firebaseio.com</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 8d268d7b..f83e2133 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,6 +8,7 @@ import 'package:flutter_go/utils/provider.dart';
import 'package:flutter_go/utils/shared_preferences.dart';
import 'package:flutter_go/views/first_page/home.dart';
import 'package:flutter_go/model/search_history.dart';
+import 'package:flutter_go/utils/analytics.dart' as Analytics;
//import 'views/welcome_page/index.dart';
const int ThemeColor = 0xFFC91B3A;
@@ -53,6 +54,7 @@ class MyApp extends StatelessWidget {
body: showWelcomePage()
),
onGenerateRoute: Application.router.generator,
+ navigatorObservers: <NavigatorObserver>[Analytics.observer],
);
}
}
diff --git a/lib/routers/routers.dart b/lib/routers/routers.dart
index 4e589b61..7715b2bf 100644
--- a/lib/routers/routers.dart
+++ b/lib/routers/routers.dart
@@ -1,6 +1,7 @@
import 'package:fluro/fluro.dart';
import 'package:flutter/material.dart';
+import 'package:flutter_go/utils/analytics.dart' show analytics;
import '../widgets/index.dart';
import './router_handler.dart';
@@ -26,6 +27,9 @@ class Routes {
widgetDemosList.forEach((demo) {
Handler handler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
+ print('组件路由params=$params widgetsItem=${demo.routerName}');
+ analytics.logEvent(
+ name: 'component', parameters: {'name': demo.routerName });
return demo.buildRouter(context);
});
router.define('${demo.routerName}', handler: handler);
diff --git a/lib/utils/analytics.dart b/lib/utils/analytics.dart
new file mode 100644
index 00000000..2a7fcf6f
--- /dev/null
+++ b/lib/utils/analytics.dart
@@ -0,0 +1,7 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:firebase_analytics/observer.dart';
+
+//统计
+FirebaseAnalytics analytics = FirebaseAnalytics();
+FirebaseAnalyticsObserver observer =
+ FirebaseAnalyticsObserver(analytics: analytics);
diff --git a/lib/utils/login.dart b/lib/utils/login.dart
new file mode 100644
index 00000000..d21b94bb
--- /dev/null
+++ b/lib/utils/login.dart
@@ -0,0 +1,26 @@
+import 'package:firebase_auth/firebase_auth.dart';
+final GoogleSignIn _googleSignIn = GoogleSignIn();
+final FirebaseAuth _auth = FirebaseAuth.instance;
+
+Future<FirebaseUser> _handleSignIn() async {
+ final GoogleSignInAccount googleUser = await _googleSignIn.signIn();
+ final GoogleSignInAuthentication googleAuth = await googleUser.authentication;
+
+ final AuthCredential credential = GoogleAuthProvider.getCredential(
+ accessToken: googleAuth.accessToken,
+ idToken: googleAuth.idToken,
+ );
+
+ final FirebaseUser user = await _auth.signInWithCredential(credential);
+ print("signed in " + user.displayName);
+ return user;
+}
+
+_handleSignIn()
+ .then((FirebaseUser user) => print(user))
+ .catchError((e) => print(e));
+
+final FirebaseUser user = await _auth.createUserWithEmailAndPassword(
+ email: 'an email',
+ password: 'a password',
+);
\ No newline at end of file
diff --git a/pubspec.yaml b/pubspec.yaml
index 3a43950c..a99e40bc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,6 +32,9 @@ dependencies:
# 日期格式化
intl: 0.15.7
city_pickers: ^0.1.0
+ firebase_analytics: ^2.0.2+1
+ firebase_auth: ^0.8.3 #auth
+ firebase_core: ^0.3.0 # add dependency for Firebase Core
dev_dependencies:
flutter_test: