提出一些无用代码

Author: CarGuo

lib/common/config/config.dart

@@ -1,8 +1,6 @@
 class Config {
   static const PAGE_SIZE = 20;
   static const DEBUG = true;
-  static const USE_NATIVE_WEBVIEW = true;
-
 
   /// //////////////////////////////////////常量////////////////////////////////////// ///
   static const TOKEN_KEY = "token";

lib/common/dao/repos_dao.dart

@@ -671,9 +671,8 @@ class ReposDao {
         url,
         null,
         {
-          "Accept": (needHtml
-              ? 'application/vnd.github.html,application/vnd.github.VERSION.raw'
-              : "")
+          "Accept":
+              'application/vnd.github.html,application/vnd.github.VERSION.raw'
         },
         null);
     if (res != null && res.result && res.data.length > 0) {

lib/common/utils/navigator_utils.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/common/router/anima_route.dart';
-import 'package:gsy_github_app_flutter/page/code_detail_page.dart';
 import 'package:gsy_github_app_flutter/page/code_detail_page_web.dart';
 import 'package:gsy_github_app_flutter/page/common_list_page.dart';
 import 'package:gsy_github_app_flutter/page/gsy_webview.dart';
@@ -109,27 +108,6 @@ class NavigatorUtils {
         ));
   }
 
-  ///文件代码详情
-  static gotoCodeDetailPage(BuildContext context,
-      {String title,
-      String userName,
-      String reposName,
-      String path,
-      String data,
-      String branch,
-      String htmlUrl}) {
-    NavigatorRouter(
-        context,
-        new CodeDetailPage(
-          title: title,
-          userName: userName,
-          reposName: reposName,
-          path: path,
-          data: data,
-          branch: branch,
-          htmlUrl: htmlUrl,
-        ));
-  }
 
   ///仓库详情通知
   static Future goNotifyPage(BuildContext context) {

lib/page/code_detail_page.dart

@@ -101,17 +101,6 @@ class _CodeDetailPageState extends State<CodeDetailPageWeb> {
       );
     }
 
-    if (Config.USE_NATIVE_WEBVIEW && Platform.isAndroid) {
-      return Scaffold(
-        appBar: AppBar(
-          title: new Text(widget.title),
-        ),
-        body: WebView(
-          initialUrl: data,
-          javascriptMode: JavascriptMode.unrestricted,
-        ),
-      );
-    }
     return Scaffold(
       appBar: AppBar(
         title: new Text(widget.title),

lib/page/code_detail_page_web.dart

@@ -1,8 +1,5 @@
-import 'dart:convert';
-
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
 import 'package:gsy_github_app_flutter/widget/gsy_common_option_widget.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
@@ -24,15 +21,23 @@ class GSYWebView extends StatelessWidget {
     }
     optionControl.url = url;
     return new Row(children: [
-      new Expanded(child: new Container()),
+      new Expanded(
+          child: new Container(
+        child: new Text(
+          title,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+        ),
+      )),
       GSYCommonOptionWidget(optionControl),
     ]);
   }
 
   final FocusNode focusNode = new FocusNode();
+
   @override
   Widget build(BuildContext context) {
-    /*return Scaffold(
+    return Scaffold(
       appBar: new AppBar(
         title: _renderTitle(),
       ),
@@ -42,7 +47,7 @@ class GSYWebView extends StatelessWidget {
             focusNode: focusNode,
           ),
           WebView(
-              initialUrl: new Uri.dataFromString(html, mimeType: 'text/html', encoding: Encoding.getByName("utf-8")).toString(),
+              initialUrl: url,
               javascriptMode: JavascriptMode.unrestricted,
               javascriptChannels: Set.from([
                 JavascriptChannel(
@@ -55,20 +60,10 @@ class GSYWebView extends StatelessWidget {
               ]))
         ],
       ),
-    );*/
-    return new WebviewScaffold(
-      withJavascript: true,
-      url: url,
-      scrollBar: true,
-      withLocalUrl: true,
-      appBar: new AppBar(
-        title: _renderTitle(),
-      ),
     );
   }
 }
 
-
 ///测试 html 代码，不管
 final testhtml = "<!DOCTYPE html>"
     "<html>"

lib/page/gsy_webview.dart

@@ -34,9 +34,8 @@ class ReleasePage extends StatefulWidget {
   _ReleasePageState createState() => _ReleasePageState();
 }
 
-
-class _ReleasePageState extends State<ReleasePage> with AutomaticKeepAliveClientMixin<ReleasePage>, GSYListState<ReleasePage> {
-
+class _ReleasePageState extends State<ReleasePage>
+    with AutomaticKeepAliveClientMixin<ReleasePage>, GSYListState<ReleasePage> {
   ///配置标题了右侧的更多显示
   final OptionControl titleOptionControl = new OptionControl();
 
@@ -45,23 +44,21 @@ class _ReleasePageState extends State<ReleasePage> with AutomaticKeepAliveClient
 
   ///绘制item
   _renderEventItem(index) {
-    ReleaseItemViewModel releaseItemViewModel = ReleaseItemViewModel.fromMap(pullLoadWidgetControl.dataList[index]);
+    ReleaseItemViewModel releaseItemViewModel =
+        ReleaseItemViewModel.fromMap(pullLoadWidgetControl.dataList[index]);
     return new ReleaseItem(
       releaseItemViewModel,
       onPressed: () {
-        if (selectIndex == 0) {
-          if (Platform.isIOS) {
-            NavigatorUtils.gotoCodeDetailPage(
-              context,
-              title: releaseItemViewModel.actionTitle,
-              userName: widget.userName,
-              reposName: widget.reposName,
-              data: HtmlUtils.generateHtml(releaseItemViewModel.actionTargetHtml, backgroundColor: GSYColors.webDraculaBackgroundColorString),
-            );
-          } else {
-            String html = HtmlUtils.generateHtml(releaseItemViewModel.actionTargetHtml, backgroundColor: GSYColors.miWhiteString, userBR: false);
-            CommonUtils.launchWebView(context, releaseItemViewModel.actionTitle, html);
-          }
+        ///没有 release 提示就不要了
+        if (selectIndex == 0 &&
+            releaseItemViewModel.actionTargetHtml != null &&
+            releaseItemViewModel.actionTargetHtml.length > 0) {
+          String html = HtmlUtils.generateHtml(
+              releaseItemViewModel.actionTargetHtml,
+              backgroundColor: GSYColors.miWhiteString,
+              userBR: false);
+          CommonUtils.launchWebView(
+              context, releaseItemViewModel.actionTitle, html);
         }
       },
       onLongPress: () {
@@ -76,7 +73,10 @@ class _ReleasePageState extends State<ReleasePage> with AutomaticKeepAliveClient
     if (await canLaunch(url)) {
       await launch(url);
     } else {
-      Fluttertoast.showToast(msg: CommonUtils.getLocale(context).option_web_launcher_error + ": " + url);
+      Fluttertoast.showToast(
+          msg: CommonUtils.getLocale(context).option_web_launcher_error +
+              ": " +
+              url);
     }
   }
 
@@ -90,7 +90,9 @@ class _ReleasePageState extends State<ReleasePage> with AutomaticKeepAliveClient
   }
 
   _getDataLogic() async {
-    return await ReposDao.getRepositoryReleaseDao(widget.userName, widget.reposName, page, needHtml: Platform.isAndroid, release: selectIndex == 0);
+    return await ReposDao.getRepositoryReleaseDao(
+        widget.userName, widget.reposName, page,
+        needHtml: true, release: selectIndex == 0);
   }
 
   @override