diff --git a/lib/views/web_page/web_view_page.dart b/lib/views/web_page/web_view_page.dart index 196ddb35..8f39c7f6 100644 --- a/lib/views/web_page/web_view_page.dart +++ b/lib/views/web_page/web_view_page.dart @@ -4,15 +4,14 @@ /// @Last Modified time: 2019-01-14 19:47:14 import 'dart:core'; -import 'dart:math'; + import 'package:flutter/material.dart'; import 'package:flutter_webview_plugin/flutter_webview_plugin.dart'; -import 'package:flutter_go/model/collection.dart'; +/// import 'package:flutter_go/model/collection.dart'; import 'package:flutter_go/event/event_bus.dart'; import 'package:flutter_go/event/event_model.dart'; import 'package:flutter_go/api/api.dart'; -import 'package:flutter_go/routers/application.dart' show Application; class WebViewPage extends StatefulWidget { final String url; @@ -22,10 +21,7 @@ class WebViewPage extends StatefulWidget { _WebViewPageState createState() => _WebViewPageState(); } -class _WebViewPageState extends State with AutomaticKeepAliveClientMixin{ - @override - bool get wantKeepAlive => true; - +class _WebViewPageState extends State { final flutterWebviewPlugin = new FlutterWebviewPlugin(); final GlobalKey _scaffoldKey = GlobalKey(); @@ -33,10 +29,8 @@ class _WebViewPageState extends State with AutomaticKeepAliveClient @override void initState() { super.initState(); - dialog = dialogContext(false); flutterWebviewPlugin.onUrlChanged.listen((String url) { - print('url change:$url'); if (url.indexOf('loginSuccess') > -1) { String urlQuery = url.substring(url.indexOf('?') + 1); @@ -68,75 +62,21 @@ class _WebViewPageState extends State with AutomaticKeepAliveClient flutterWebviewPlugin.close(); } }); - flutterWebviewPlugin.onStateChanged.listen((state) async { - print('url state:$state'); - if(state.type == WebViewState.finishLoad) { - } - }); } - Widget dialogContext(bool isShow){ - if(!isShow){ - return Container(child:Text("")); - } - return Container( - height: 200, - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - SizedBox(height: 20), - Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Text('分享到',style: TextStyle(fontSize:16,color: Colors.deepOrange)), - FlatButton( - child: Text('取消',style: TextStyle(fontSize:16,color: Colors.black45),), - onPressed: (){ - setState(() { - dialog = dialogContext(false); - - }); - } - ) - ] - ) - ]) - ); - } - - Container dialog; @override Widget build(BuildContext context) { return Scaffold( - key: _scaffoldKey, - appBar: AppBar( - title: Text(widget.title), -// actions: [ -// IconButton( -// icon: Icon(Icons.announcement), -// onPressed: () { -// /// flutterWebviewPlugin.evalJavascript("alert('Flutter Go H5 版本')"); -// setState(() { -// dialog = dialogContext(true); -// }); -// }, -// ) -// ], - ), - body: WebviewScaffold( - url: widget.url, - withZoom: true, - withLocalStorage: true, - withJavascript: true, - userAgent: "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Mobile Safari/537.36", - bottomNavigationBar:dialog, - initialChild: Container( - color: Colors.white, - child: const Center( - child: Text("Loading...."), - ), - ), - )); - + key: _scaffoldKey, + appBar: AppBar( + title: Text(widget.title), + ), + body: WebviewScaffold( + url: widget.url, + withZoom: false, + withLocalStorage: true, + withJavascript: true, + ), + ); } }