Merge pull request alibaba#206 from Nealyang/master

登陆

README.md

@@ -25,7 +25,7 @@ Language: [English](https://github.com/alibaba/flutter-go/blob/master/README-en.
 
 android下载地址:
 
-<img src="https://img.alicdn.com/tfs/TB1jGgfQ7voK1RjSZFNXXcxMVXa-438-426.png" width="200px">
+<img src="https://img.alicdn.com/tfs/TB1ylxGTMHqK1RjSZFgXXa7JXXa-436-432.png" width="200px">
 
 iphone下载地址:
 暂无

android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1

android/app/.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

android/app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/app/.settings/org.eclipse.buildship.core.prefs

@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1

ios/Runner.xcodeproj/project.pbxproj

@@ -511,6 +511,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = Launch2;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 4WLT68XRNA;
@@ -527,7 +528,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.alibaba.fluttergo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "FlutterGO-alibaba-develop";
+				PROVISIONING_PROFILE_SPECIFIER = FlutterGO_alibaba_distribution_app_store;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;

lib/api/api.dart

@@ -0,0 +1,10 @@
+class Api{
+  // static const String BASE_URL = 'http://127.0.0.1:6001/';
+  static const String BASE_URL = 'http://flutter-go.alibaba.net/';
+
+  static const String DO_LOGIN = BASE_URL+'doLogin';//登陆
+
+  static const String CHECK_LOGIN = BASE_URL+'checkLogin';//验证登陆
+
+  static const String LOGOUT = BASE_URL+'logout';//退出登陆
+}

lib/components/widget_demo.dart

@@ -101,7 +101,7 @@ class _WidgetDemoState extends State<WidgetDemo> {
       // 插入操作
       _collectionControl
           .insert(Collection(name: widget.title, router: _router))
-          .then((result) {
+          .then((result) {  
         if (this.mounted) {
           setState(() {
             _hasCollected = true;

lib/main.dart

@@ -3,36 +3,73 @@ import 'package:fluro/fluro.dart';
 import 'package:flutter/rendering.dart';
 import 'routers/routers.dart';
 import 'routers/application.dart';
-
+import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:flutter_go/utils/provider.dart';
 import 'package:flutter_go/utils/shared_preferences.dart';
 import 'package:flutter_go/views/home.dart';
 import 'package:flutter_go/model/search_history.dart';
 import 'package:flutter_go/utils/analytics.dart' as Analytics;
+import 'package:flutter_go/views/login_page/login_page.dart';
+import 'package:flutter_go/utils/data_utils.dart';
+
 //import 'views/welcome_page/index.dart';
 
 const int ThemeColor = 0xFFC91B3A;
 SpUtil sp;
 var db;
 
-class MyApp extends StatelessWidget {
-  MyApp()  {
+class MyApp extends StatefulWidget {
+  MyApp() {
     final router = new Router();
 
     Routes.configureRoutes(router);
 
     Application.router = router;
   }
+
+  @override
+  _MyAppState createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
+  bool _hasLogin = false;
+  bool _isLoading = true;
+
+  @override
+  void initState() {
+    super.initState();
+    DataUtils.checkLogin().then((hasLogin) {
+      setState(() {
+        _hasLogin = hasLogin;
+        _isLoading = false;
+      });
+    }).catchError((onError){
+      setState(() {
+        _hasLogin = true;
+        _isLoading = false;
+      });
+      print('身份信息验证失败:$onError');
+    });
+  }
+
   showWelcomePage() {
-    // 暂时关掉欢迎介绍
-    return AppPage();
-//    bool showWelcome = sp.getBool(SharedPreferencesKeys.showWelcome);
-//    if (showWelcome == null || showWelcome == true) {
-//      return WelcomePage();
-//    } else {
-//      return AppPage();
-//    }
+    if (_isLoading) {
+      return Container(
+        color: const Color(ThemeColor),
+        child: Center(
+          child: SpinKitPouringHourglass(color: Colors.white),
+        ),
+      );
+    } else {
+      // 判断是否已经登录
+      if (_hasLogin) {
+        return AppPage();
+      } else {
+        return LoginPage();
+      }
+    }
   }
+
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
@@ -50,17 +87,14 @@ class MyApp extends StatelessWidget {
           size: 35.0,
         ),
       ),
-      home: new Scaffold(
-        body: showWelcomePage()
-      ),
+      home: new Scaffold(body: showWelcomePage()),
       debugShowCheckedModeBanner: false,
       onGenerateRoute: Application.router.generator,
       navigatorObservers: <NavigatorObserver>[Analytics.observer],
     );
   }
 }
 
-
 void main() async {
   final provider = new Provider();
   await provider.init(true);

lib/model/user_info.dart

@@ -0,0 +1,24 @@
+class UserInfo {
+  String username;
+  int id;
+  String avatarPic;
+  String themeColor;
+  String urlName;
+
+  UserInfo({
+    this.avatarPic,
+    this.id,
+    this.themeColor,
+    this.urlName,
+    this.username,
+  });
+
+  factory UserInfo.fromJson(Map<String, dynamic> json) {
+    return UserInfo(
+        avatarPic: json['avatar_pic'],
+        id: int.parse(json['id']),
+        username: json['name'],
+        themeColor: json['theme_color'],
+        urlName: json['url_name']);
+  }
+}

lib/model/user_info_cache.dart

@@ -0,0 +1,62 @@
+/// @Author: 一凨 
+/// @Date: 2019-01-07 16:24:42 
+/// @Last Modified by: 一凨
+/// @Last Modified time: 2019-01-08 17:37:42
+
+import 'dart:async';
+
+import 'package:flutter_go/utils/sql.dart';
+
+abstract class UserInfoInterface {
+  String get username;
+  String get password;
+}
+
+class UserInfo implements UserInfoInterface {
+  String username;
+  String password;
+
+  UserInfo({this.username, this.password});
+
+  factory UserInfo.fromJSON(Map json){
+    return UserInfo(username: json['username'],password: json['password']);
+  }
+
+  Object toMap() {
+    return {'username': username, 'password': password};
+  }
+}
+
+class UserInfoControlModel {
+  final String table = 'userInfo';
+  Sql sql;
+
+  UserInfoControlModel() {
+    sql = Sql.setTable(table);
+  }
+
+  // 获取所有的收藏
+
+  // 插入新的缓存
+  Future insert(UserInfo userInfo) {
+    var result =
+        sql.insert({'username': userInfo.username, 'password': userInfo.password});
+    return result;
+  }
+
+  // 获取用户信息
+  Future<List<UserInfo>> getAllInfo() async {
+    List list = await sql.getByCondition();
+    List<UserInfo> resultList = [];
+    list.forEach((item){
+      print(item);
+      resultList.add(UserInfo.fromJSON(item));
+    });
+    return resultList;
+  }
+
+  // 清空表中数据
+  Future deleteAll() async{
+    return await sql.deleteAll();
+  }
+}

lib/routers/router_handler.dart

@@ -6,6 +6,7 @@ import '../widgets/404.dart';
 import 'package:flutter_go/components/full_screen_code_dialog.dart';
 import 'package:flutter_go/views/web_page/web_view_page.dart';
 import 'package:flutter_go/views/home.dart';
+import 'package:flutter_go/views/login_page/login_page.dart';
 
 // app的首页
 var homeHandler = new Handler(
@@ -26,6 +27,10 @@ var widgetNotFoundHandler = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<String>> params) {
   return new WidgetNotFound();
 });
+var loginPageHandler = new Handler(
+    handlerFunc: (BuildContext context, Map<String, List<String>> params) {
+  return LoginPage();
+});
 
 var fullScreenCodeDialog = new Handler(
     handlerFunc: (BuildContext context, Map<String, List<String>> params) {

lib/routers/routers.dart

@@ -12,6 +12,7 @@ class Routes {
   static String widgetDemo = '/widget-demo';
   static String codeView = '/code-view';
   static String webViewPage = '/web-view-page';
+  static String loginPage = '/loginpage';
 
   static void configureRoutes(Router router) {
     List widgetDemosList = new WidgetDemoList().getDemos();
@@ -22,6 +23,7 @@ class Routes {
 
     router.define('/category/:type', handler: categoryHandler);
     router.define('/category/error/404', handler: widgetNotFoundHandler);
+    router.define(loginPage, handler: loginPageHandler);
     router.define(codeView,handler:fullScreenCodeDialog);
     router.define(webViewPage,handler:webViewPageHand);
       widgetDemosList.forEach((demo) {

lib/utils/data_utils.dart

@@ -0,0 +1,30 @@
+import 'dart:async' show Future;
+
+import './net_utils.dart';
+import '../model/user_info.dart';
+import 'package:flutter_go/api/api.dart';
+
+
+class DataUtils{
+  // 登陆获取用户信息
+  static Future<UserInfo> doLogin(Map<String,String> params) async{
+    var response = await NetUtils.post(Api.DO_LOGIN, params);
+    UserInfo userInfo = UserInfo.fromJson(response['data']);
+    return userInfo;
+  }
+
+  // 验证登陆
+
+  static Future<bool> checkLogin() async{
+    var response = await NetUtils.get(Api.CHECK_LOGIN);
+    print('验证登陆：$response');
+    return response['success'];
+  }
+
+  // 退出登陆
+    static Future<bool> logout() async{
+    var response = await NetUtils.get(Api.LOGOUT);
+    print('退出登陆 $response');
+    return response['success'];
+  }
+}