From c575c16cce6cf8b9a58e4984e05fc18917859b94 Mon Sep 17 00:00:00 2001 From: wylyl22 <2373073266@qq.com> Date: Fri, 16 Sep 2022 18:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ui/exclude/exclude_contacts_page.dart | 2 +- lib/ui/loading.dart | 18 +++++++++--------- lib/ui/login/login_page.dart | 17 +++++++++-------- lib/ui/user/members_page.dart | 9 ++++----- lib/ui/user/user_page.dart | 1 + lib/ui/widget/appdialog.dart | 7 ++----- pubspec.yaml | 2 +- 7 files changed, 27 insertions(+), 29 deletions(-) diff --git a/lib/ui/exclude/exclude_contacts_page.dart b/lib/ui/exclude/exclude_contacts_page.dart index 6c62aa1..21d95bc 100644 --- a/lib/ui/exclude/exclude_contacts_page.dart +++ b/lib/ui/exclude/exclude_contacts_page.dart @@ -29,7 +29,7 @@ class _ExcludeContactsPageState extends State { @override void initState() { super.initState(); - _viewLoading(); + // _viewLoading(); } Future _viewLoading() async { diff --git a/lib/ui/loading.dart b/lib/ui/loading.dart index 1b94932..30b89b6 100644 --- a/lib/ui/loading.dart +++ b/lib/ui/loading.dart @@ -9,7 +9,7 @@ import 'package:provider/provider.dart'; import '../constants/environment/environment.dart'; import '../providers/user_provider.dart'; import '../utils/hive_store.dart'; -import 'login/login_page.dart'; + class Loading extends StatefulWidget { Loading({Key? key}) : super(key: key); @@ -27,14 +27,14 @@ class _LoadingState extends State { void initState() { super.initState(); final userProvider = Provider.of(context, listen: false); - var env = const String.fromEnvironment('ENV', defaultValue: 'dev'); - if (kDebugMode) { - print('env :$env'); - } - DevEV.instance.setEnvironment( - context, - environment: env == 'dev', - ); + // var env = const String.fromEnvironment('ENV', defaultValue: 'dev'); + // if (kDebugMode) { + // print('env :$env'); + // } + // DevEV.instance.setEnvironment( + // context, + // environment: env == 'dev', + // ); Future.delayed(const Duration(milliseconds: 1000), () async { await initialAll(); if (!await userProvider.init()) { diff --git a/lib/ui/login/login_page.dart b/lib/ui/login/login_page.dart index 412ec02..e2404c9 100644 --- a/lib/ui/login/login_page.dart +++ b/lib/ui/login/login_page.dart @@ -12,6 +12,7 @@ import 'package:provider/provider.dart'; import '../../base/base_style.dart'; import '../../constants/api.dart'; +import '../../constants/environment/environment.dart'; import '../../model/network/api_client.dart'; import '../../providers/user_provider.dart'; import '../../utils/toast/cloud_toast.dart'; @@ -54,14 +55,14 @@ class _LoginPageState extends State { _phoneController = TextEditingController(); _smsCodeController = TextEditingController(); final userProvider = Provider.of(context, listen: false); - // var env = const String.fromEnvironment('ENV', defaultValue: 'dev'); - // if (kDebugMode) { - // print('env :$env'); - // } - // DevEV.instance.setEnvironment( - // context, - // environment: env == 'dev', - // ); + var env = const String.fromEnvironment('ENV', defaultValue: 'dev'); + if (kDebugMode) { + print('env :$env'); + } + DevEV.instance.setEnvironment( + context, + environment: env == 'dev', + ); } @override diff --git a/lib/ui/user/members_page.dart b/lib/ui/user/members_page.dart index 8c120a7..a8dca61 100644 --- a/lib/ui/user/members_page.dart +++ b/lib/ui/user/members_page.dart @@ -5,8 +5,7 @@ import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:project_telephony/base/base_style.dart'; -import 'package:project_telephony/ui/tab_navigator.dart'; -import 'package:project_telephony/ui/user/user_page.dart'; + import 'package:project_telephony/ui/widget/check_radio.dart'; import 'package:project_telephony/ui/widget/plone_back_button.dart'; @@ -34,11 +33,11 @@ List? data; final List _piceList = [ ChooseItems( month: 12, - pice: 0.1, + pice: 99, ), ChooseItems( month: 1, - pice: 0.01, + pice: 10, ), ]; ChooseItems? _chooseItem = _piceList[0]; @@ -52,7 +51,7 @@ List payWay = [ ]; class _MembersPageState extends State { - double nowPrice = 0.01; + double nowPrice = 10; final EasyRefreshController _easyRefreshController = EasyRefreshController(); @override diff --git a/lib/ui/user/user_page.dart b/lib/ui/user/user_page.dart index 245ab50..93b99c5 100644 --- a/lib/ui/user/user_page.dart +++ b/lib/ui/user/user_page.dart @@ -124,6 +124,7 @@ class _UserPageState extends State { if (UserTool.userProvider.isLogin) { // var res=await apiClient.request(API.app.trialVip); + //没领过0领过1 if (UserTool.userProvider.userInfo.isTrial != 1) { showDialog( context: context, diff --git a/lib/ui/widget/appdialog.dart b/lib/ui/widget/appdialog.dart index e289f87..d0d025f 100644 --- a/lib/ui/widget/appdialog.dart +++ b/lib/ui/widget/appdialog.dart @@ -1,10 +1,7 @@ -import 'dart:ffi'; + import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_easyrefresh/easy_refresh.dart'; -import 'package:project_telephony/base/base_style.dart'; -import 'package:project_telephony/ui/widget/plone_bottom.dart'; + import 'package:project_telephony/utils/headers.dart'; import 'package:project_telephony/utils/user_tool.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index adf8acd..96aeeee 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.0.1+2 +version: 2.0.0+2 environment: sdk: ">=2.16.0 <3.0.0"