From 2932ad3a641f464f3daa16856ccbfaf6157e4434 Mon Sep 17 00:00:00 2001 From: jyuesong <425698907@qq.com> Date: Fri, 21 Jan 2022 10:01:40 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E5=89=AA=E5=88=87?= =?UTF-8?q?=E6=9D=BF=E6=8E=A7=E5=88=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f389f32d --- lib/base/sp_const.dart | 1 - lib/base/userinfo_viewmodel.dart | 12 ----- lib/module/config/config_edit_page.dart | 7 +-- lib/module/env/add_env_page.dart | 6 --- lib/module/login/login_page.dart | 18 ++----- .../dependencies/add_dependency_page.dart | 4 -- lib/module/others/other_page.dart | 47 ------------------- .../others/scripts/script_edit_page.dart | 4 -- lib/module/others/update_password_page.dart | 3 -- lib/module/task/add_task_page.dart | 6 --- 10 files changed, 5 insertions(+), 103 deletions(-) diff --git a/lib/base/sp_const.dart b/lib/base/sp_const.dart index c0ac61d..647ce53 100644 --- a/lib/base/sp_const.dart +++ b/lib/base/sp_const.dart @@ -4,4 +4,3 @@ String spUserName = "username"; String spPassWord = "password"; String spTheme = "dart_mode"; String spSecretLogined = "secret_logined"; -String spForbidClipBoard = "forbid_read_clipboard"; diff --git a/lib/base/userinfo_viewmodel.dart b/lib/base/userinfo_viewmodel.dart index 8496704..ab33602 100644 --- a/lib/base/userinfo_viewmodel.dart +++ b/lib/base/userinfo_viewmodel.dart @@ -8,16 +8,11 @@ class UserInfoViewModel { String? _userName; String? _passWord; bool _useSecertLogined = false; - bool _forbidReadClipBoard = false; UserInfoViewModel() { String userInfoJson = SpUtil.getString(spUserInfo); _userName = SpUtil.getString(spUserName); _passWord = SpUtil.getString(spPassWord); - _forbidReadClipBoard = SpUtil.getBool( - spForbidClipBoard, - defValue: false, - ); _useSecertLogined = SpUtil.getBool(spSecretLogined, defValue: false); _host = SpUtil.getString(spHost, defValue: ''); @@ -39,11 +34,6 @@ class UserInfoViewModel { SpUtil.putString(spPassWord, password); } - void forbidReadClipBoard(bool forbid) { - _forbidReadClipBoard = forbid; - SpUtil.putBool(spForbidClipBoard, forbid); - } - void useSecretLogin(bool use) { _useSecertLogined = use; SpUtil.putBool(spSecretLogined, _useSecertLogined); @@ -64,8 +54,6 @@ class UserInfoViewModel { bool get useSecretLogined => _useSecertLogined; - bool get forbidReadClipBoarded => _forbidReadClipBoard; - bool isLogined() { return token != null && token!.isNotEmpty; } diff --git a/lib/module/config/config_edit_page.dart b/lib/module/config/config_edit_page.dart index de67a2d..b7e7268 100644 --- a/lib/module/config/config_edit_page.dart +++ b/lib/module/config/config_edit_page.dart @@ -4,12 +4,9 @@ import 'package:qinglong_app/base/http/api.dart'; import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/ql_app_bar.dart'; import 'package:qinglong_app/base/theme.dart'; -import 'package:qinglong_app/base/userinfo_viewmodel.dart'; import 'package:qinglong_app/module/config/config_viewmodel.dart'; import 'package:qinglong_app/utils/extension.dart'; -import '../../main.dart'; - class ConfigEditPage extends ConsumerStatefulWidget { final String content; final String title; @@ -47,7 +44,8 @@ class _ConfigEditPageState extends ConsumerState { actions: [ InkWell( onTap: () async { - HttpResponse response = await Api.saveFile(widget.title, _controller.text); + HttpResponse response = + await Api.saveFile(widget.title, _controller.text); if (response.success) { "提交成功".toast(); ref.read(configProvider).loadContent(widget.title); @@ -80,7 +78,6 @@ class _ConfigEditPageState extends ConsumerState { ), child: SingleChildScrollView( child: TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, focusNode: node, style: TextStyle( color: ref.read(themeProvider).themeColor.descColor(), diff --git a/lib/module/env/add_env_page.dart b/lib/module/env/add_env_page.dart index 4e6127b..339b86a 100644 --- a/lib/module/env/add_env_page.dart +++ b/lib/module/env/add_env_page.dart @@ -3,13 +3,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qinglong_app/base/http/api.dart'; import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/ql_app_bar.dart'; -import 'package:qinglong_app/base/userinfo_viewmodel.dart'; import 'package:qinglong_app/module/env/env_bean.dart'; import 'package:qinglong_app/module/env/env_viewmodel.dart'; import 'package:qinglong_app/utils/extension.dart'; -import '../../main.dart'; - class AddEnvPage extends ConsumerStatefulWidget { final EnvBean? envBean; @@ -101,7 +98,6 @@ class _AddEnvPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, focusNode: focusNode, controller: _nameController, decoration: const InputDecoration( @@ -131,7 +127,6 @@ class _AddEnvPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, controller: _valueController, maxLines: 8, minLines: 1, @@ -162,7 +157,6 @@ class _AddEnvPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, controller: _remarkController, decoration: const InputDecoration( hintText: "请输入备注", diff --git a/lib/module/login/login_page.dart b/lib/module/login/login_page.dart index 2708ddd..dc941b8 100644 --- a/lib/module/login/login_page.dart +++ b/lib/module/login/login_page.dart @@ -142,7 +142,6 @@ class _LoginPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, onChanged: (_) { setState(() {}); }, @@ -178,7 +177,6 @@ class _LoginPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, onChanged: (_) { setState(() {}); }, @@ -200,7 +198,6 @@ class _LoginPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, onChanged: (_) { setState(() {}); }, @@ -236,7 +233,6 @@ class _LoginPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, onChanged: (_) { setState(() {}); }, @@ -258,7 +254,6 @@ class _LoginPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, onChanged: (_) { setState(() {}); }, @@ -281,9 +276,7 @@ class _LoginPageState extends ConsumerState { ), ), Padding( - padding: const EdgeInsets.symmetric( - horizontal: 25, - ), + padding: const EdgeInsets.symmetric(horizontal: 25,), child: Row( children: [ Checkbox( @@ -314,9 +307,7 @@ class _LoginPageState extends ConsumerState { ), ), ), - SizedBox( - width: 10, - ), + SizedBox(width: 10,), ], ), ), @@ -325,9 +316,7 @@ class _LoginPageState extends ConsumerState { ), Container( alignment: Alignment.center, - padding: const EdgeInsets.symmetric( - horizontal: 40, - ), + padding: const EdgeInsets.symmetric(horizontal: 40,), child: SizedBox( width: MediaQuery.of(context).size.width - 80, child: IgnorePointer( @@ -407,7 +396,6 @@ class _LoginPageState extends ConsumerState { onChanged: (value) { twoFact = value; }, - enableInteractiveSelection: !getIt().forbidReadClipBoarded, maxLines: 1, keyboardType: TextInputType.number, decoration: const InputDecoration( diff --git a/lib/module/others/dependencies/add_dependency_page.dart b/lib/module/others/dependencies/add_dependency_page.dart index 4da32c5..f1ba40b 100644 --- a/lib/module/others/dependencies/add_dependency_page.dart +++ b/lib/module/others/dependencies/add_dependency_page.dart @@ -4,12 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qinglong_app/base/http/api.dart'; import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/ql_app_bar.dart'; -import 'package:qinglong_app/base/userinfo_viewmodel.dart'; import 'package:qinglong_app/module/others/dependencies/dependency_viewmodel.dart'; import 'package:qinglong_app/utils/extension.dart'; -import '../../../main.dart'; - class AddDependencyPage extends ConsumerStatefulWidget { const AddDependencyPage({ Key? key, @@ -135,7 +132,6 @@ class _AddDependencyPageState extends ConsumerState { height: 10, ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, controller: _nameController, decoration: const InputDecoration( contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5), diff --git a/lib/module/others/other_page.dart b/lib/module/others/other_page.dart index 25a33b5..68d0921 100644 --- a/lib/module/others/other_page.dart +++ b/lib/module/others/other_page.dart @@ -278,53 +278,6 @@ class _OtherPageState extends ConsumerState { const Divider( indent: 15, ), - Padding( - padding: const EdgeInsets.only( - left: 15, - right: 15, - top: 5, - ), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Expanded( - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - "禁止读取剪切板", - style: TextStyle( - color: ref.watch(themeProvider).themeColor.titleColor(), - fontSize: 16, - ), - ), - Text( - "开启后输入框无法使用系统自带的复制粘贴功能,输入法的复制粘贴功能不受影响", - style: TextStyle( - color: ref.watch(themeProvider).themeColor.descColor(), - fontSize: 12, - ), - ), - ], - ), - ), - CupertinoSwitch( - value: getIt().forbidReadClipBoarded, - onChanged: (forbid) { - getIt().forbidReadClipBoard(forbid); - setState(() { - - }); - }, - ), - ], - ), - ), - const Divider( - indent: 15, - ), GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { diff --git a/lib/module/others/scripts/script_edit_page.dart b/lib/module/others/scripts/script_edit_page.dart index c7a960f..8c9dc45 100644 --- a/lib/module/others/scripts/script_edit_page.dart +++ b/lib/module/others/scripts/script_edit_page.dart @@ -4,12 +4,9 @@ import 'package:qinglong_app/base/http/api.dart'; import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/ql_app_bar.dart'; import 'package:qinglong_app/base/theme.dart'; -import 'package:qinglong_app/base/userinfo_viewmodel.dart'; import 'package:qinglong_app/module/config/config_viewmodel.dart'; import 'package:qinglong_app/utils/extension.dart'; -import '../../../main.dart'; - class ScriptEditPage extends ConsumerStatefulWidget { final String content; final String title; @@ -80,7 +77,6 @@ class _ScriptEditPageState extends ConsumerState { ), child: SingleChildScrollView( child: TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, focusNode: node, style: TextStyle( color: ref.read(themeProvider).themeColor.descColor(), diff --git a/lib/module/others/update_password_page.dart b/lib/module/others/update_password_page.dart index 50f373c..12716ac 100644 --- a/lib/module/others/update_password_page.dart +++ b/lib/module/others/update_password_page.dart @@ -92,7 +92,6 @@ class _UpdatePasswordPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, focusNode: focusNode, controller: _nameController, decoration: const InputDecoration( @@ -123,7 +122,6 @@ class _UpdatePasswordPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, obscureText: true, controller: _passwordController, maxLines: 1, @@ -155,7 +153,6 @@ class _UpdatePasswordPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: false, obscureText: true, maxLines: 1, controller: _passwordAgainController, diff --git a/lib/module/task/add_task_page.dart b/lib/module/task/add_task_page.dart index 1bd9bff..5f6c575 100644 --- a/lib/module/task/add_task_page.dart +++ b/lib/module/task/add_task_page.dart @@ -3,13 +3,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:qinglong_app/base/http/api.dart'; import 'package:qinglong_app/base/http/http.dart'; import 'package:qinglong_app/base/ql_app_bar.dart'; -import 'package:qinglong_app/base/userinfo_viewmodel.dart'; import 'package:qinglong_app/module/task/task_bean.dart'; import 'package:qinglong_app/module/task/task_viewmodel.dart'; import 'package:qinglong_app/utils/extension.dart'; -import '../../main.dart'; - class AddTaskPage extends ConsumerStatefulWidget { final TaskBean? taskBean; @@ -101,7 +98,6 @@ class _AddTaskPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, focusNode: focusNode, controller: _nameController, decoration: const InputDecoration( @@ -132,7 +128,6 @@ class _AddTaskPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, controller: _commandController, maxLines: 4, minLines: 1, @@ -164,7 +159,6 @@ class _AddTaskPageState extends ConsumerState { ), ), TextField( - enableInteractiveSelection: !getIt().forbidReadClipBoarded, controller: _cronController, decoration: const InputDecoration( contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),