替换webview

Author: CarGuo

lib/common/utils/CommonUtils.dart

@@ -104,8 +104,6 @@ class CommonUtils {
 
   static void launchWebView(BuildContext context, String title, String url) {
     if (url.startsWith("http")) {
-      print("fff");
-      print(url);
       NavigatorUtils.goGSYWebView(context, url, title);
     } else {
       NavigatorUtils.goGSYWebView(context, new Uri.dataFromString(url, mimeType: 'text/html', encoding: Encoding.getByName("utf-8")).toString(), title);

lib/common/utils/NavigatorUtils.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/page/CodeDetailPage.dart';
+import 'package:gsy_github_app_flutter/page/CodeDetailPageWeb.dart';
 import 'package:gsy_github_app_flutter/page/CommonListPage.dart';
 import 'package:gsy_github_app_flutter/page/GSYWebView.dart';
 import 'package:gsy_github_app_flutter/page/HomePage.dart';
@@ -124,4 +125,20 @@ class NavigatorUtils {
     );
   }
 
+  ///文件代码详情
+  static gotoCodeDetailPageWeb(BuildContext context, {String title, String userName, String reposName, String path, String data, String branch, String htmlUrl}) {
+    Navigator.push(
+        context,
+        new MaterialPageRoute(
+            builder: (context) => new CodeDetailPageWeb(
+              title: title,
+              userName: userName,
+              reposName: reposName,
+              path: path,
+              data: data,
+              branch: branch,
+              htmlUrl: htmlUrl,
+            )));
+  }
+
 }

lib/page/CodeDetailPageWeb.dart

@@ -0,0 +1,113 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_spinkit/flutter_spinkit.dart';
+import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
+import 'package:gsy_github_app_flutter/common/dao/ReposDao.dart';
+import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
+import 'package:gsy_github_app_flutter/common/utils/HtmlUtils.dart';
+import 'package:gsy_github_app_flutter/widget/GSYTitleBar.dart';
+
+/**
+ * 文件代码详情
+ * Created by guoshuyu
+ * Date: 2018-07-24
+ */
+
+class CodeDetailPageWeb extends StatefulWidget {
+  final String userName;
+
+  final String reposName;
+
+  final String path;
+
+  final String data;
+
+  final String title;
+
+  final String branch;
+
+  final String htmlUrl;
+
+  CodeDetailPageWeb({this.title, this.userName, this.reposName, this.path, this.data, this.branch, this.htmlUrl});
+
+  @override
+  _CodeDetailPageState createState() => _CodeDetailPageState(this.title, this.userName, this.reposName, this.path, this.data, this.branch, this.htmlUrl);
+}
+
+class _CodeDetailPageState extends State<CodeDetailPageWeb> {
+  final String userName;
+
+  final String reposName;
+
+  final String path;
+
+  final String branch;
+
+  final String htmlUrl;
+
+  String data ;
+
+  final String title;
+
+  _CodeDetailPageState(this.title, this.userName, this.reposName, this.path, this.data, this.branch, this.htmlUrl);
+
+  @override
+  void initState() {
+    super.initState();
+    print("22222222");
+    if (data == null) {
+      print("333333333");
+      ReposDao.getReposFileDirDao(userName, reposName, path: path, branch: branch, text: true, isHtml: true).then((res) {
+        if (res != null && res.result) {
+          String data2 = HtmlUtils.resolveHtmlFile(res, "java");
+          final flutterWebviewPlugin = new FlutterWebviewPlugin();
+          String url = new Uri.dataFromString(data2, mimeType: 'text/html', encoding: Encoding.getByName("utf-8")).toString();
+          print("-------------");
+          print(url);
+          flutterWebviewPlugin.reload();
+          setState(() {
+            this.data = url;
+          });
+        }
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if(data == null) {
+      return new Scaffold(
+        appBar: new AppBar(
+          title: GSYTitleBar(
+            title
+          ),
+        ),
+        body: new Center(
+          child: new Container(
+            width: 140.0,
+            height: 140.0,
+            padding: new EdgeInsets.all(4.0),
+            child: new Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                new SpinKitDoubleBounce(color: Color(GSYColors.primaryValue)),
+                new Container(width: 10.0),
+                new Container(child: new Text(GSYStrings.loading_text, style: GSYConstant.middleText)),
+              ],
+            ),
+          ),
+        ),
+      );
+    }
+    return new WebviewScaffold(
+      withJavascript: true,
+      url: data,
+      withLocalUrl: true,
+      appBar: new AppBar(
+        title: new Text(title),
+      ),
+    );
+    ;
+  }
+}

lib/page/RepositoryFileListPage.dart

@@ -133,15 +133,25 @@ class RepositoryDetailFileListPageState extends GSYListState<RepositoryDetailFil
             path: path,
             branch: branchControl.currentBranch,
           );
+
+
         } else {
-          CommonUtils.showLoadingDialog(context);
+          /*CommonUtils.showLoadingDialog(context);
           ReposDao.getReposFileDirDao(userName, reposName, path: path, branch: branchControl.currentBranch, text: true, isHtml: true).then((res) {
             if (res != null && res.result) {
               Navigator.pop(context);
               String data = HtmlUtils.resolveHtmlFile(res, "java");
               CommonUtils.launchWebView(context, fileItemViewModel.name, data);
             }
-          });
+          });*/
+          NavigatorUtils.gotoCodeDetailPageWeb(
+            context,
+            title: fileItemViewModel.name,
+            reposName: reposName,
+            userName: userName,
+            path: path,
+            branch: branchControl.currentBranch,
+          );
         }
       }
     }