From 9b6d8285e3a7874a36cb18da877533af1af62fbb Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Fri, 10 May 2024 13:57:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9debug=20=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E7=9A=84=E5=AD=98=E6=94=BE=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=20debug=20=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/lib/app_settings/app_settings.dart | 3 ++- star_lock/lib/main.dart | 1 - star_lock/lib/mine/about/about_console.dart | 2 +- .../lib/{ => mine/about}/debug/controller.dart | 7 +------ .../lib/{ => mine/about}/debug/debug_console.dart | 7 +++---- .../lib/{ => mine/about}/debug/debug_tool.dart | 15 ++++++++++++--- star_lock/lib/{ => mine/about}/debug/log.dart | 0 star_lock/lib/{ => mine/about}/debug/popup.dart | 4 ++-- star_lock/lib/{ => mine/about}/debug/tile.dart | 4 ++-- .../{ => mine/about}/debug/utils/scrollable.dart | 0 star_lock/lib/mine/mall/lockMall_logic.dart | 4 +--- star_lock/lib/mine/mall/lockMall_state.dart | 2 +- .../{ => mine/mall}/webview/webview_logic.dart | 0 .../advancedFeaturesWeb_logic.dart | 2 +- .../advancedFeaturesWeb_state.dart | 2 +- .../starLockApplication/starLockApplication.dart | 2 +- 16 files changed, 28 insertions(+), 27 deletions(-) rename star_lock/lib/{ => mine/about}/debug/controller.dart (95%) rename star_lock/lib/{ => mine/about}/debug/debug_console.dart (98%) rename star_lock/lib/{ => mine/about}/debug/debug_tool.dart (74%) rename star_lock/lib/{ => mine/about}/debug/log.dart (100%) rename star_lock/lib/{ => mine/about}/debug/popup.dart (93%) rename star_lock/lib/{ => mine/about}/debug/tile.dart (97%) rename star_lock/lib/{ => mine/about}/debug/utils/scrollable.dart (100%) rename star_lock/lib/{ => mine/mall}/webview/webview_logic.dart (100%) diff --git a/star_lock/lib/app_settings/app_settings.dart b/star_lock/lib/app_settings/app_settings.dart index e768a2ba..51d3a6d0 100644 --- a/star_lock/lib/app_settings/app_settings.dart +++ b/star_lock/lib/app_settings/app_settings.dart @@ -2,7 +2,8 @@ import 'package:flutter/foundation.dart'; import 'package:get/get.dart'; import 'dart:io'; -import 'package:star_lock/debug/debug_console.dart'; +import 'package:star_lock/mine/about/debug/debug_console.dart'; + class AppLog { static bool _printLog = false; diff --git a/star_lock/lib/main.dart b/star_lock/lib/main.dart index 5b7c18bc..2d09e1a8 100644 --- a/star_lock/lib/main.dart +++ b/star_lock/lib/main.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:star_lock/debug/debug_console.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/translations/trans_lib.dart'; import 'app.dart'; diff --git a/star_lock/lib/mine/about/about_console.dart b/star_lock/lib/mine/about/about_console.dart index 1ba49b66..1673d87c 100644 --- a/star_lock/lib/mine/about/about_console.dart +++ b/star_lock/lib/mine/about/about_console.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:get/get.dart'; -import 'package:star_lock/debug/debug_tool.dart'; +import 'package:star_lock/mine/about/debug/debug_tool.dart'; import 'package:star_lock/tools/storage.dart'; class AboutConsole extends GetxController { diff --git a/star_lock/lib/debug/controller.dart b/star_lock/lib/mine/about/debug/controller.dart similarity index 95% rename from star_lock/lib/debug/controller.dart rename to star_lock/lib/mine/about/debug/controller.dart index 27cbdb43..d55a8b2b 100644 --- a/star_lock/lib/debug/controller.dart +++ b/star_lock/lib/mine/about/debug/controller.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:math'; -import 'package:date_format/date_format.dart'; import 'package:flutter/material.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; @@ -11,14 +10,10 @@ import 'package:rxdart/rxdart.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/blue/blue_manage.dart'; -import 'package:star_lock/blue/io_protocol/io_cleanUpUsers.dart'; import 'package:star_lock/blue/io_tool/io_tool.dart'; -import 'package:star_lock/blue/sender_data.dart'; import 'package:star_lock/blue/sender_manage.dart'; -import 'package:star_lock/debug/log.dart'; import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart'; -import 'package:star_lock/network/api_repository.dart'; -import 'package:star_lock/tools/baseGetXController.dart'; +import 'package:star_lock/mine/about/debug/log.dart'; import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/dateTool.dart'; import 'package:star_lock/tools/storage.dart'; diff --git a/star_lock/lib/debug/debug_console.dart b/star_lock/lib/mine/about/debug/debug_console.dart similarity index 98% rename from star_lock/lib/debug/debug_console.dart rename to star_lock/lib/mine/about/debug/debug_console.dart index aec4e20d..b7a96d22 100644 --- a/star_lock/lib/debug/debug_console.dart +++ b/star_lock/lib/mine/about/debug/debug_console.dart @@ -4,11 +4,10 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter/material.dart'; +import 'package:star_lock/mine/about/debug/controller.dart'; +import 'package:star_lock/mine/about/debug/log.dart'; +import 'package:star_lock/mine/about/debug/tile.dart'; -import 'package:star_lock/debug/controller.dart'; -import 'package:star_lock/debug/log.dart'; -import 'package:star_lock/debug/tile.dart'; -import 'package:star_lock/debug/utils/scrollable.dart'; /// # Debug Console /// diff --git a/star_lock/lib/debug/debug_tool.dart b/star_lock/lib/mine/about/debug/debug_tool.dart similarity index 74% rename from star_lock/lib/debug/debug_tool.dart rename to star_lock/lib/mine/about/debug/debug_tool.dart index 2a8e74d9..20e1d58e 100644 --- a/star_lock/lib/debug/debug_tool.dart +++ b/star_lock/lib/mine/about/debug/debug_tool.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/debug/controller.dart'; -import 'package:star_lock/debug/debug_console.dart'; +import 'package:star_lock/app_settings/app_colors.dart'; +import 'package:star_lock/mine/about/debug/debug_console.dart'; class DeBug { static void log(String message, {String? tag}) { @@ -24,7 +25,15 @@ class DeBug { offset.value += details.delta; }, child: FloatingActionButton( - child: Icon(Icons.bug_report), + backgroundColor: AppColors.mainColor, + shape: ContinuousRectangleBorder( + borderRadius: BorderRadius.all(Radius.circular(20.r)), + side: BorderSide(color: Colors.white, width: 2.w), + ), + child: const Icon( + Icons.bug_report, + color: Colors.white, + ), onPressed: () { if (openInfo) { Get.back(); diff --git a/star_lock/lib/debug/log.dart b/star_lock/lib/mine/about/debug/log.dart similarity index 100% rename from star_lock/lib/debug/log.dart rename to star_lock/lib/mine/about/debug/log.dart diff --git a/star_lock/lib/debug/popup.dart b/star_lock/lib/mine/about/debug/popup.dart similarity index 93% rename from star_lock/lib/debug/popup.dart rename to star_lock/lib/mine/about/debug/popup.dart index a50f1f9a..f2e1b035 100644 --- a/star_lock/lib/debug/popup.dart +++ b/star_lock/lib/mine/about/debug/popup.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:star_lock/debug/controller.dart'; -import 'package:star_lock/debug/debug_console.dart'; +import 'package:star_lock/mine/about/debug/controller.dart'; +import 'package:star_lock/mine/about/debug/debug_console.dart'; /// A widget that adds a floating button for debugging purposes. class DebugConsolePopup extends StatefulWidget { diff --git a/star_lock/lib/debug/tile.dart b/star_lock/lib/mine/about/debug/tile.dart similarity index 97% rename from star_lock/lib/debug/tile.dart rename to star_lock/lib/mine/about/debug/tile.dart index a23cd98a..1a1a6b4e 100644 --- a/star_lock/lib/debug/tile.dart +++ b/star_lock/lib/mine/about/debug/tile.dart @@ -4,8 +4,8 @@ import 'package:flutter/services.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; -import 'package:star_lock/debug/debug_tool.dart'; -import 'package:star_lock/debug/log.dart'; +import 'package:star_lock/mine/about/debug/debug_tool.dart'; +import 'package:star_lock/mine/about/debug/log.dart'; class DebugConsoleTile extends StatefulWidget { final DebugConsoleLog log; diff --git a/star_lock/lib/debug/utils/scrollable.dart b/star_lock/lib/mine/about/debug/utils/scrollable.dart similarity index 100% rename from star_lock/lib/debug/utils/scrollable.dart rename to star_lock/lib/mine/about/debug/utils/scrollable.dart diff --git a/star_lock/lib/mine/mall/lockMall_logic.dart b/star_lock/lib/mine/mall/lockMall_logic.dart index 5f7741e3..9ff79012 100644 --- a/star_lock/lib/mine/mall/lockMall_logic.dart +++ b/star_lock/lib/mine/mall/lockMall_logic.dart @@ -1,17 +1,15 @@ import 'dart:convert'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluwx/fluwx.dart'; import 'package:get/get.dart'; import 'package:star_lock/flavors.dart'; import 'package:star_lock/main/lockMian/lockMain/xhj/lockMain_xhj_logic.dart'; import 'package:star_lock/mine/mall/lockMall_entity.dart'; import 'package:star_lock/mine/mall/lockMall_state.dart'; +import 'package:star_lock/mine/mall/webview/webview_logic.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/pay/wx_pay_tool.dart'; -import 'package:star_lock/webview/webview_logic.dart'; import 'package:webview_flutter/webview_flutter.dart'; import '../../app_settings/app_settings.dart'; diff --git a/star_lock/lib/mine/mall/lockMall_state.dart b/star_lock/lib/mine/mall/lockMall_state.dart index 9864ccc7..2f7e687c 100644 --- a/star_lock/lib/mine/mall/lockMall_state.dart +++ b/star_lock/lib/mine/mall/lockMall_state.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:star_lock/webview/webview_logic.dart'; +import 'package:star_lock/mine/mall/webview/webview_logic.dart'; import 'package:webview_flutter/webview_flutter.dart'; class LockMallState { diff --git a/star_lock/lib/webview/webview_logic.dart b/star_lock/lib/mine/mall/webview/webview_logic.dart similarity index 100% rename from star_lock/lib/webview/webview_logic.dart rename to star_lock/lib/mine/mall/webview/webview_logic.dart diff --git a/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart b/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart index 6480dca7..f3eb70ef 100644 --- a/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart +++ b/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_logic.dart @@ -5,12 +5,12 @@ import 'package:fluwx/fluwx.dart'; import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/flavors.dart'; +import 'package:star_lock/mine/mall/webview/webview_logic.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_entity.dart'; import 'package:star_lock/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_state.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/pay/wx_pay_tool.dart'; -import 'package:star_lock/webview/webview_logic.dart'; import 'package:webview_flutter/webview_flutter.dart'; class AdvancedFeaturesWebLogic extends BaseGetXController { diff --git a/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_state.dart b/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_state.dart index 75c9b027..d4bfba80 100644 --- a/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_state.dart +++ b/star_lock/lib/mine/valueAddedServices/advancedFeaturesWeb/advancedFeaturesWeb_state.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:star_lock/webview/webview_logic.dart'; +import 'package:star_lock/mine/mall/webview/webview_logic.dart'; import 'package:webview_flutter/webview_flutter.dart'; class AdvancedFeaturesWebState { diff --git a/star_lock/lib/starLockApplication/starLockApplication.dart b/star_lock/lib/starLockApplication/starLockApplication.dart index d4a7d389..db065a62 100644 --- a/star_lock/lib/starLockApplication/starLockApplication.dart +++ b/star_lock/lib/starLockApplication/starLockApplication.dart @@ -4,8 +4,8 @@ import 'package:star_lock/flavors.dart'; import 'package:star_lock/login/login/starLock_login_page.dart'; import 'package:star_lock/login/login/starLock_login_xhj_page.dart'; import 'package:star_lock/main/lockMian/lockMain/xhj/lockMain_xhj_page.dart'; +import 'package:star_lock/mine/about/debug/debug_tool.dart'; import 'package:star_lock/tools/appFirstEnterHandle.dart'; -import 'package:star_lock/debug/debug_tool.dart'; import 'package:star_lock/tools/storage.dart'; import '../main/lockMian/lockMain/lockMain_page.dart';