修改类名

CarGuo · CarGuo · commit b88f6da6ea23 · 2019-03-03T17:57:50.000+08:00
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -34,7 +34,7 @@ PODS:
 DEPENDENCIES:
   - connectivity (from `.symlinks/plugins/connectivity/ios`)
   - device_info (from `.symlinks/plugins/device_info/ios`)
-  - Flutter (from `.symlinks/flutter/ios`)
+  - Flutter (from `.symlinks/flutter/ios-release`)
   - flutter_statusbar (from `.symlinks/plugins/flutter_statusbar/ios`)
   - flutter_webview_plugin (from `.symlinks/plugins/flutter_webview_plugin/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
@@ -57,7 +57,7 @@ EXTERNAL SOURCES:
   device_info:
     :path: ".symlinks/plugins/device_info/ios"
   Flutter:
-    :path: ".symlinks/flutter/ios"
+    :path: ".symlinks/flutter/ios-release"
   flutter_statusbar:
     :path: ".symlinks/plugins/flutter_statusbar/ios"
   flutter_webview_plugin:
diff --git a/lib/common/ab/SqlProvider.dart b/lib/common/ab/SqlProvider.dart
@@ -44,15 +44,6 @@ abstract class BaseDbProvider {
     }
     return await SqlManager.getCurrentDatabase();
   }
-
-
-  static List<dynamic> parseListResult(String data) {
-    return json.decode(data);
-  }
-
-  static Map<String, dynamic> parseResult(String data) {
-    return json.decode(data);
-  }
 }
 
 
diff --git a/lib/common/ab/provider/event/ReceivedEventDbProvider.dart b/lib/common/ab/provider/event/ReceivedEventDbProvider.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:flutter/foundation.dart';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
 import 'package:gsy_github_app_flutter/common/model/Event.dart';
 import 'package:sqflite/sqflite.dart';
@@ -65,7 +66,7 @@ class ReceivedEventDbProvider extends BaseDbProvider {
       ReceivedEventDbProvider provider = ReceivedEventDbProvider.fromMap(maps.first);
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/event/UserEventDbProvider.dart b/lib/common/ab/provider/event/UserEventDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -80,7 +80,7 @@ class UserEventDbProvider extends BaseDbProvider {
       List<Event> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/issue/IssueCommentDbProvider.dart b/lib/common/ab/provider/issue/IssueCommentDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -88,7 +88,7 @@ class IssueCommentDbProvider extends BaseDbProvider {
       List<Issue> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/issue/IssueDetailDbProvider.dart b/lib/common/ab/provider/issue/IssueDetailDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -84,7 +84,7 @@ class IssueDetailDbProvider extends BaseDbProvider {
     if (provider != null) {
 
       ///使用 compute 的 Isolate 优化 json decode
-      var mapData = await compute(BaseDbProvider.parseResult, provider.data as String);
+      var mapData = await compute(CodeUtils.decodeMapResult, provider.data as String);
       return Issue.fromJson(mapData);
     }
     return null;
diff --git a/lib/common/ab/provider/repos/ReadHistoryDbProvider.dart b/lib/common/ab/provider/repos/ReadHistoryDbProvider.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
 import 'package:gsy_github_app_flutter/common/config/Config.dart';
 import 'package:gsy_github_app_flutter/common/model/Repository.dart';
 import 'package:sqflite/sqflite.dart';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 /**
  * 本地已读历史表
@@ -103,7 +103,7 @@ class ReadHistoryDbProvider extends BaseDbProvider {
         ReadHistoryDbProvider provider = ReadHistoryDbProvider.fromMap(providerMap);
 
         ///使用 compute 的 Isolate 优化 json decode
-        var mapData = await compute(BaseDbProvider.parseResult, provider.data);
+        var mapData = await compute(CodeUtils.decodeMapResult, provider.data);
 
         list.add(Repository.fromJson(mapData));
       }
diff --git a/lib/common/ab/provider/repos/RepositoryCommitsDbProvider.dart b/lib/common/ab/provider/repos/RepositoryCommitsDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -85,7 +85,7 @@ class RepositoryCommitsDbProvider extends BaseDbProvider {
       List<RepoCommit> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
 
       if (eventMap.length > 0) {
diff --git a/lib/common/ab/provider/repos/RepositoryDetailDbProvider.dart b/lib/common/ab/provider/repos/RepositoryDetailDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -80,7 +80,7 @@ class RepositoryDetailDbProvider extends BaseDbProvider {
 
 
       ///使用 compute 的 Isolate 优化 json decode
-      var mapData = await compute(BaseDbProvider.parseResult, provider.data as String);
+      var mapData = await compute(CodeUtils.decodeMapResult, provider.data as String);
 
       return Repository.fromJson(mapData);
     }
diff --git a/lib/common/ab/provider/repos/RepositoryEventDbProvider.dart b/lib/common/ab/provider/repos/RepositoryEventDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -82,7 +82,7 @@ class RepositoryEventDbProvider extends BaseDbProvider {
       List<Event> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
 
       if (eventMap.length > 0) {
diff --git a/lib/common/ab/provider/repos/RepositoryForkDbProvider.dart b/lib/common/ab/provider/repos/RepositoryForkDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -82,7 +82,7 @@ class RepositoryForkDbProvider extends BaseDbProvider {
       List<Repository> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/repos/RepositoryIssueDbProvider.dart b/lib/common/ab/provider/repos/RepositoryIssueDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -87,7 +87,7 @@ class RepositoryIssueDbProvider extends BaseDbProvider {
       List<Issue> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/repos/RepositoryStarDbProvider.dart b/lib/common/ab/provider/repos/RepositoryStarDbProvider.dart
@@ -1,6 +1,6 @@
 
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -84,7 +84,7 @@ class RepositoryStarDbProvider extends BaseDbProvider {
       List<User> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/repos/RepositoryWatcherDbProvider.dart b/lib/common/ab/provider/repos/RepositoryWatcherDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -81,7 +81,7 @@ class RepositoryWatcherDbProvider extends BaseDbProvider {
       List<User> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/repos/TrendRepositoryDbProvider.dart b/lib/common/ab/provider/repos/TrendRepositoryDbProvider.dart
@@ -1,10 +1,11 @@
 
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
 import 'package:gsy_github_app_flutter/common/model/TrendingRepoModel.dart';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 import 'package:sqflite/sqflite.dart';
 
 /**
@@ -79,7 +80,7 @@ class TrendRepositoryDbProvider extends BaseDbProvider {
 
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/user/UserFollowedDbProvider.dart b/lib/common/ab/provider/user/UserFollowedDbProvider.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
-
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
 import 'package:gsy_github_app_flutter/common/model/User.dart';
@@ -82,7 +81,7 @@ class UserFollowedDbProvider extends BaseDbProvider {
       List<User> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/user/UserFollowerDbProvider.dart b/lib/common/ab/provider/user/UserFollowerDbProvider.dart
@@ -1,6 +1,6 @@
 
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -84,7 +84,7 @@ class UserFollowerDbProvider extends BaseDbProvider {
 
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/user/UserInfoDbProvider.dart b/lib/common/ab/provider/user/UserInfoDbProvider.dart
@@ -2,7 +2,7 @@
 
 
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -84,7 +84,7 @@ class UserInfoDbProvider extends BaseDbProvider {
 
 
       ///使用 compute 的 Isolate 优化 json decode
-      var mapData = await compute(BaseDbProvider.parseResult, userProvider.data as String);
+      var mapData = await compute(CodeUtils.decodeMapResult, userProvider.data as String);
       return User.fromJson(mapData);
     }
     return null;
diff --git a/lib/common/ab/provider/user/UserOrgsDbProvider.dart b/lib/common/ab/provider/user/UserOrgsDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -82,7 +82,7 @@ class UserOrgsDbProvider extends BaseDbProvider {
       List<UserOrg> list = new List();
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/user/UserReposDbProvider.dart b/lib/common/ab/provider/user/UserReposDbProvider.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
 import 'package:gsy_github_app_flutter/common/model/Repository.dart';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 import 'package:sqflite/sqflite.dart';
 
 /**
@@ -83,7 +84,7 @@ class UserReposDbProvider extends BaseDbProvider {
 
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
       if (eventMap.length > 0) {
         for (var item in eventMap) {
diff --git a/lib/common/ab/provider/user/UserStaredDbProvider.dart b/lib/common/ab/provider/user/UserStaredDbProvider.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'dart:convert';
+import 'package:gsy_github_app_flutter/common/utils/CodeUtils.dart';
 
 import 'package:flutter/foundation.dart';
 import 'package:gsy_github_app_flutter/common/ab/SqlProvider.dart';
@@ -83,7 +83,7 @@ class UserStaredDbProvider extends BaseDbProvider {
 
 
       ///使用 compute 的 Isolate 优化 json decode
-      List<dynamic> eventMap = await compute(BaseDbProvider.parseListResult, provider.data as String);
+      List<dynamic> eventMap = await compute(CodeUtils.decodeListResult, provider.data as String);
 
 
       if (eventMap.length > 0) {
diff --git a/lib/common/utils/CodeUtils.dart b/lib/common/utils/CodeUtils.dart
@@ -0,0 +1,19 @@
+
+
+import 'dart:convert';
+
+///isolate 的 compute 需要静态方法
+class CodeUtils {
+
+  static List<dynamic> decodeListResult(String data) {
+    return json.decode(data);
+  }
+
+  static Map<String, dynamic> decodeMapResult(String data) {
+    return json.decode(data);
+  }
+
+  static String encodeToString(String data) {
+    return json.encode(data);
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -44,15 +44,6 @@ abstract class BaseDbProvider {`
`44`	`44`	`}`
`45`	`45`	`return await SqlManager.getCurrentDatabase();`
`46`	`46`	`}`
`47`		`-`
`48`		`-`
`49`		`- static List<dynamic> parseListResult(String data) {`
`50`		`- return json.decode(data);`
`51`		`- }`
`52`		`-`
`53`		`- static Map<String, dynamic> parseResult(String data) {`
`54`		`- return json.decode(data);`
`55`		`- }`
`56`	`47`	`}`
`57`	`48`
`58`	`49`