接口升级为https

android/app/build.gradle

@@ -29,8 +29,8 @@ android {
         applicationId "com.canhuah.wanandroid"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode 111
+        versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
+    <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorPrimary" />
+<item android:drawable="@color/colorPrimary" />
 
-    <!-- You can insert your own image assets here -->
-   <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@drawable/ic_logo" />
-    </item>
+<!-- You can insert your own image assets here -->
+<item>
+    <bitmap
+        android:gravity="center"
+        android:src="@drawable/ic_logo" />
+</item>
 </layer-list>

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>8.0</string>
+  <string>9.0</string>
 </dict>
 </plist>

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Runner.xcodeproj/project.pbxproj

@@ -21,6 +21,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		C41780FF9C22B5DA4C91A057 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EAF75F88FD856F91BB5A7B0 /* libPods-Runner.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -56,6 +57,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		9EAF75F88FD856F91BB5A7B0 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -65,12 +67,21 @@
 			files = (
 				9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
 				3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
+				C41780FF9C22B5DA4C91A057 /* libPods-Runner.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		58202AEE2276597126343165 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				9EAF75F88FD856F91BB5A7B0 /* libPods-Runner.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -91,7 +102,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
-				CF3B75C9A7D2FA2A4C99F110 /* Frameworks */,
+				AE05D344300683DFF0F76D26 /* Pods */,
+				58202AEE2276597126343165 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -127,19 +139,28 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		AE05D344300683DFF0F76D26 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		97C146ED1CF9000F007C117D /* Runner */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				CDBCAE67524DB6514D369BED /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				943C18EEEDBE3DEAD02E7BF7 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -214,6 +235,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
 		};
+		943C18EEEDBE3DEAD02E7BF7 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -228,6 +271,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		CDBCAE67524DB6514D369BED /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

lib/http/Api.dart → lib/http/api.dart

@@ -1,6 +1,6 @@
 class Api {
 
-  static const String BaseUrl = "http://www.wanandroid.com/";
+  static const String BaseUrl = "https://www.wanandroid.com/";
 
   //首页banner
   static const   String BANNER = "banner/json";

lib/http/HttpUtil.dart → lib/http/http_util.dart

@@ -3,7 +3,7 @@ import 'package:http/http.dart' as http;
 
 import 'dart:convert';
 
-import 'package:wanAndroid/http/Api.dart';
+import 'package:wanAndroid/http/api.dart';
 
 /*数据接口类型errorCode>0是接口请求成功
 {
@@ -83,7 +83,7 @@ class HttpUtil {
       }
 
       if (res.statusCode != 200) {
-        errorMsg = "网络请求错误,状态码:" + res.statusCode.toString();
+        errorMsg = "网络请求错误,状态码:" + res.statusCode.toString() ;
 
         _handError(errorCallback, errorMsg);
         return;

lib/http/HttpUtilWithCookie.dart → lib/http/http_util_with_cookie.dart

@@ -4,7 +4,7 @@ import 'package:http/http.dart' as http;
 import 'dart:convert';
 
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wanAndroid/http/Api.dart';
+import 'package:wanAndroid/http/api.dart';
 
 /*数据接口类型errorCode>0是接口请求成功
 {

lib/item/ArticleItem.dart → lib/item/article_item.dart

@@ -1,24 +1,24 @@
 import 'package:flutter/material.dart';
-import 'package:wanAndroid/http/Api.dart';
-import 'package:wanAndroid/http/HttpUtilWithCookie.dart';
-import 'package:wanAndroid/pages/ArticleDetailPage.dart';
-import 'package:wanAndroid/pages/LoginPage.dart';
+import 'package:wanAndroid/http/api.dart';
+import 'package:wanAndroid/http/http_util_with_cookie.dart';
+import 'package:wanAndroid/pages/article_detail_page.dart';
+import 'package:wanAndroid/pages/login_page.dart';
 import 'package:wanAndroid/util/DataUtils.dart';
 import 'package:wanAndroid/util/StringUtils.dart';
 
-
 ///个人感觉条目比较复杂的话可以单独拿出来,而且可以复用.可以对比CollectListPage.dart中的item哪个更合理
 class ArticleItem extends StatefulWidget {
   var itemData;
 
   //是否来自搜索列表
-  bool isSearch;
+   bool isSearch;
+
   //搜索列表的id
   String id;
 
-  ArticleItem(var itemData){
+  ArticleItem(var itemData) {
     this.itemData = itemData;
-    this.isSearch =false;
+    this.isSearch = false;
   }
 
   //命名构造函数,搜索列表的item和普通的item有些不一样
@@ -30,7 +30,7 @@ class ArticleItem extends StatefulWidget {
 
   @override
   State<StatefulWidget> createState() {
-    return new ArticleItemState();
+    return ArticleItemState();
   }
 }
 
@@ -46,14 +46,14 @@ class ArticleItemState extends State<ArticleItem> {
   }
 
   _login() {
-    Navigator.of(context).push(new MaterialPageRoute(builder: (context) {
-      return new LoginPage();
+    Navigator.of(context).push(MaterialPageRoute(builder: (context) {
+      return LoginPage();
     }));
   }
 
   void _itemClick(itemData) async {
-    await Navigator.of(context).push(new MaterialPageRoute(builder: (context) {
-      return new ArticleDetailPage(
+    await Navigator.of(context).push(MaterialPageRoute(builder: (context) {
+      return ArticleDetailPage(
         title: itemData['title'],
         url: itemData['link'],
       );
@@ -80,81 +80,81 @@ class ArticleItemState extends State<ArticleItem> {
   Widget build(BuildContext context) {
     bool isCollect = widget.itemData["collect"];
 
-    Row row1 = new Row(
+    Row author = Row(
       mainAxisAlignment: MainAxisAlignment.start,
       children: <Widget>[
-        new Expanded(
-            child: new Row(
+        Expanded(
+            child: Row(
           children: <Widget>[
-            new Text('作者:  '),
-            new Text(
+            Text('作者:  '),
+            Text(
               widget.itemData['author'],
-              style: new TextStyle(color: Theme.of(context).accentColor),
+              style: TextStyle(color: Theme.of(context).accentColor),
             ),
           ],
         )),
-        new Text(widget.itemData['niceDate'])
+        Text(widget.itemData['niceDate'])
       ],
     );
 
-    Row title = new Row(
+    Row title = Row(
       children: <Widget>[
-        new Expanded(
-          child: new Text.rich(
+        Expanded(
+          child: Text.rich(
             widget.isSearch
                 ? StringUtils.getTextSpan(widget.itemData['title'], widget.id)
-                : new TextSpan(text: widget.itemData['title']),
+                : TextSpan(text: widget.itemData['title']),
             softWrap: true,
-            style: new TextStyle(fontSize: 16.0, color: Colors.black),
+            style: TextStyle(fontSize: 16.0, color: Colors.black),
             textAlign: TextAlign.left,
           ),
         )
       ],
     );
 
-    Row chapterName = new Row(
+    Row chapterName = Row(
 //      mainAxisAlignment: MainAxisAlignment.end,
       children: <Widget>[
-        new Expanded(
-          child: new Text(
+        Expanded(
+          child: Text(
             widget.isSearch ? '' : widget.itemData['chapterName'],
             softWrap: true,
-            style: new TextStyle(color: Theme.of(context).accentColor),
+            style: TextStyle(color: Theme.of(context).accentColor),
             textAlign: TextAlign.left,
           ),
         ),
-        new GestureDetector(
-          child: new Icon(
+        IconButton(
+          icon: Icon(
             isCollect ? Icons.favorite : Icons.favorite_border,
             color: isCollect ? Colors.red : null,
           ),
-          onTap: () {
+          onPressed: () {
             _handleOnItemCollect(widget.itemData);
           },
         )
       ],
     );
 
-    Column column = new Column(
+    Column column = Column(
       children: <Widget>[
-        new Padding(
-          padding: EdgeInsets.all(10.0),
-          child: row1,
-        ),
-        new Padding(
+        Padding(
           padding: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0),
+          child: author,
+        ),
+        Padding(
+          padding: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 0.0),
           child: title,
         ),
-        new Padding(
-          padding: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 10.0),
+        Padding(
+          padding: EdgeInsets.fromLTRB(10.0, 5.0, 10.0, 5.0),
           child: chapterName,
         ),
       ],
     );
 
-    return new Card(
+    return Card(
       elevation: 4.0,
-      child: new InkWell(
+      child: InkWell(
         child: column,
         onTap: () {
           _itemClick(widget.itemData);