Merge pull request #58 from NKUST-ITC/develop

Update to v3.1.10
NKUST-ITC · Jun 25, 2019 · 89b9e0b · 89b9e0b
2 parents 2f470ff + 1c2a25a
commit 89b9e0b
Show file tree

Hide file tree

Showing 14 changed files with 354 additions and 249 deletions.
diff --git a/android/app/src/main/res/drawable/ic_launcher.png b/android/app/src/main/res/drawable/ic_launcher.png
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -250,7 +250,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
-				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
 				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",

diff --git a/lib/config/constants.dart b/lib/config/constants.dart
@@ -62,6 +62,6 @@ class Constants {
   static const int NOTIFICATION_COURSE_ID = 101;
   static const int NOTIFICATION_FCM_ID = 200;
 
-  static const FANS_PAGE_ID = '301942414015612';
+  static const FANS_PAGE_ID = '954175941266264';
   static const FANS_PAGE_URL = 'https://www.facebook.com/$FANS_PAGE_ID/';
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -15,6 +15,7 @@ import 'package:nkust_ap/pages/page.dart';
 import 'package:nkust_ap/res/resource.dart' as Resource;
 import 'package:nkust_ap/utils/app_localizations.dart';
 import 'package:nkust_ap/utils/firebase_analytics_utils.dart';
+import 'package:nkust_ap/utils/preferences.dart';
 import 'package:nkust_ap/utils/utils.dart';
 import 'package:nkust_ap/widgets/share_data_widget.dart';
 
@@ -50,19 +51,30 @@ void main() async {
   }
 }
 
-class MyApp extends StatelessWidget {
+class MyApp extends StatefulWidget {
+  @override
+  _MyAppState createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
   FirebaseAnalytics analytics;
   FirebaseMessaging _firebaseMessaging;
   Brightness brightness = Brightness.light;
 
   @override
-  Widget build(BuildContext context) {
+  void initState() {
     if (Platform.isAndroid || Platform.isIOS) {
       analytics = FirebaseAnalytics();
       _firebaseMessaging = FirebaseMessaging();
       _initFCM();
       FA.analytics = analytics;
+      Preferences.init();
     }
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return ShareDataWidget(
       child: MaterialApp(
         localeResolutionCallback:

diff --git a/lib/pages/home/score_page.dart b/lib/pages/home/score_page.dart
@@ -314,13 +314,17 @@ class ScorePageState extends State<ScorePage>
       if (e is DioError) {
         switch (e.type) {
           case DioErrorType.RESPONSE:
-            Utils.handleResponseError(context, 'getSemester', mounted, e);
+            if (mounted) {
+              Utils.handleResponseError(context, 'getSemester', mounted, e);
+            }
             break;
           case DioErrorType.CANCEL:
             break;
           default:
             state = _State.error;
-            Utils.handleDioError(context, e);
+            if (mounted) {
+              Utils.handleDioError(context, e);
+            }
             break;
         }
       } else {
@@ -339,7 +343,7 @@ class ScorePageState extends State<ScorePage>
   }
 
   _getSemesterScore() async {
-    Helper.cancelToken.cancel("");
+    Helper.cancelToken?.cancel("");
     Helper.cancelToken = CancelToken();
     if (mounted) {
       setState(() {