x1ongzhu 6 tahun lalu
induk
melakukan
72ab735b29

+ 2 - 3
lib/pages/loginFirst.dart

@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:flutter/cupertino.dart';
 import '../styles/colors.dart';
 import 'dart:ui';
 import '../styles/totast.dart';
-import '../styles/api.dart';
-import 'loginSecond.dart'; //登录第二页面
+import 'loginSecond.dart';
+import '../utils/Utils.dart';
 
 class LoginFirst extends StatefulWidget {
   @override

+ 0 - 4
lib/pages/roomList.dart

@@ -1,13 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-import 'package:dio/dio.dart';
 import '../styles/colors.dart';
-import '../styles/api.dart';
-import 'dart:convert';
 import '../widget/room_item.dart';
 import '../widget/popupButton_my.dart';
 import 'dart:ui';
-import '../styles/netUtil.dart';
 import '../net/HttpManager.dart';
 import '../net/Result.dart';
 

+ 3 - 5
lib/pages/setting.dart

@@ -6,7 +6,6 @@ import 'package:dio/dio.dart';
 import 'package:intl/intl.dart';
 import 'package:package_info/package_info.dart';
 import '../styles/colors.dart';
-import '../styles/api.dart';
 import 'dart:io';
 import 'dart:async';
 import 'dart:convert';
@@ -318,10 +317,9 @@ class SettingState extends State<Setting> {
     _image.readAsBytes().then((bytes) async {
       String encoded1 = 'data:image/jpeg;base64,' + base64Encode(bytes);
       FormData formData = new FormData.from({"base64": encoded1});
-      final response = await Dio().post(domain + 'assets/uploadImg', data: formData);
-      final res = json.decode(response.toString());
-      if (res['success']) {
-        updateUserInfo(userInfo, res['data'], 'icon');
+      Result res = await HttpManager.post('assets/uploadImg', data: formData);
+      if (res.success) {
+        updateUserInfo(userInfo, res.data, 'icon');
       }
     });
   }

+ 0 - 105
lib/styles/netUtil.dart

@@ -1,105 +0,0 @@
-import 'package:dio/dio.dart';
-import 'api.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class NetUtil {
-  static const String GET = "get";
-  static const String POST = "post";
-
-  //get请求
-  static void get(String url, Function callBack,
-      {Map<String, dynamic> params, Function errorCallBack}) async {
-    if (!url.startsWith("http")) {
-      url = domain + url;
-    }
-
-    _request(url, callBack,
-        method: GET, params: params, errorCallBack: errorCallBack);
-  }
-
-  //post请求
-  static void post(String url, Function callBack,
-      {Map<String, dynamic> params, Function errorCallBack}) async {
-    print('**************');
-    if (!url.startsWith("http")) {
-      url = domain + url;
-    }
-    _request(url, callBack,
-        method: POST, params: params, errorCallBack: errorCallBack);
-  }
-
-  //具体的还是要看返回数据的基本结构
-  //公共代码部分
-  static void _request(String url, Function callBack,
-      {String method,
-      Map<String, dynamic> params,
-      Function errorCallBack}) async {
-    print("<net> url :<" + method + ">" + url);
-
-    if (params != null && params.isNotEmpty) {
-      print("<net> params :" + params.toString());
-    }
-
-    String errorMsg = "";
-    int statusCode;
-
-    final prefs = await SharedPreferences.getInstance();
-    String _electricContest = prefs.getString('token') != null
-        ? prefs.getString('token')
-        : '';
-    try {
-      Response response;
-      if (method == GET) {
-        //组合GET请求的参数
-        if (params != null && params.isNotEmpty) {
-          StringBuffer sb = new StringBuffer("?");
-          params.forEach((key, value) {
-            sb.write("$key" + "=" + "$value" + "&");
-          });
-          String paramStr = sb.toString();
-          paramStr = paramStr.substring(0, paramStr.length - 1);
-          url += paramStr;
-        }
-        response = await Dio()
-            .get(url, options: Options(headers: {"token": _electricContest}));
-      } else {
-        if (params != null && params.isNotEmpty) {
-          FormData _formData = FormData.from(params);
-          response = await Dio().post(url,
-              data: _formData,
-              options: Options(headers: {"token": _electricContest}));
-        } else {
-          response = await Dio().post(url,
-              options: Options(headers: {"token": _electricContest}));
-        }
-      }
-
-      statusCode = response.statusCode;
-
-      print(response);
-      //打印结果
-
-      //处理错误部分
-      if (statusCode < 0) {
-        errorMsg = "网络请求错误,状态码:" + statusCode.toString();
-        _handError(errorCallBack, errorMsg);
-        return;
-      }
-
-      if (callBack != null) {
-        callBack(response.data);
-        print("<net> response data:" + response.data);
-      }
-    } catch (exception) {
-      _handError(errorCallBack, exception.toString());
-    }
-  }
-
-  //处理异常
-  static void _handError(Function errorCallback, String errorMsg) {
-    if (errorCallback != null) {
-      errorCallback(errorMsg);
-    }
-    print("<net> errorMsg :" + errorMsg);
-  }
-}

+ 8 - 0
lib/utils/Utils.dart

@@ -0,0 +1,8 @@
+bool checkPhone(phone) {
+  bool result = false;
+  RegExp exp = new RegExp(r"^1[3-9]\d{9}$");
+  if (exp.hasMatch(phone)) {
+    result = true;
+  }
+  return result;
+}