Merge branch 'master' of gitee.com:starlock-cn/app-starlock

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;

star_lock/lib/blue/io_protocol/io_getStarLockStatusInfo.dart

@@ -1,6 +1,7 @@
 
 import 'dart:convert';
 
+import '../../tools/dateTool.dart';
 import '../io_reply.dart';
 import '../io_sender.dart';
 import '../io_tool/io_tool.dart';
@@ -25,7 +26,7 @@ class GetStarLockStatuInfoCommand extends SenderProtocol {
   @override
   String toString() {
     return 'GetStarLockStatuInfoCommand{lockID: $lockID, '
-        'utcTimeStamp: $utcTimeStamp, unixTimeStamp: $unixTimeStamp, '
+        'utcTimeStamp: ${DateTool().dateIntToYMDHNString(utcTimeStamp)}, unixTimeStamp: ${DateTool().dateIntToYMDHNString(unixTimeStamp)}, '
         'userID: $userID, privateKey: $privateKey}';
   }
 

star_lock/lib/login/login/starLock_login_page.dart

@@ -3,7 +3,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:star_lock/flavors.dart';
-import 'package:star_lock/widget/star_input_formatter.dart';
 
 import '../../appRouters.dart';
 import '../../app_settings/app_colors.dart';

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';

star_lock/lib/main/lockDetail/lockDetail/lockDetail_logic.dart

@@ -7,6 +7,7 @@ import 'package:intl/intl.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyDetail/keyOperationRecord/keyOperationRecord_entity.dart';
+import 'package:star_lock/widget/permission/permission_dialog.dart';
 
 import '../../../app_settings/app_settings.dart';
 import '../../../blue/blue_manage.dart';
@@ -17,7 +18,6 @@ import '../../../blue/io_tool/io_tool.dart';
 import '../../../blue/io_tool/manager_event_bus.dart';
 import '../../../blue/sender_manage.dart';
 import '../../../network/api_repository.dart';
-import '../../../permission/permission_dialog.dart';
 import '../../../tools/baseGetXController.dart';
 import '../../../tools/commonDataManage.dart';
 import '../../../tools/eventBusEventManage.dart';

star_lock/lib/main/lockDetail/lockSet/lockEscalation/lockEscalation_logic.dart

@@ -16,10 +16,10 @@ import 'package:star_lock/blue/io_tool/io_tool.dart';
 import 'package:star_lock/blue/io_tool/manager_event_bus.dart';
 import 'package:star_lock/blue/sender_manage.dart';
 import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_logic.dart';
-import 'package:star_lock/permission/permission_dialog.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
 import 'package:star_lock/tools/commonDataManage.dart';
 import 'package:star_lock/tools/storage.dart';
+import 'package:star_lock/widget/permission/permission_dialog.dart';
 
 import '../../../../app_settings/app_settings.dart';
 import 'lockEscalation_state.dart';

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 {

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';

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
 ///

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();

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 {

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;

star_lock/lib/mine/addLock/addLock/addLock_logic.dart

@@ -4,8 +4,8 @@ import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:star_lock/appRouters.dart';
 import 'package:star_lock/mine/addLock/addLock/addLock_state.dart';
-import 'package:star_lock/permission/permission_dialog.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
+import 'package:star_lock/widget/permission/permission_dialog.dart';
 
 
 class AddLockLogic extends BaseGetXController {

star_lock/lib/mine/addLock/lockAddress/gaode/lockAddressGaoDe_page.dart

@@ -10,7 +10,7 @@ import 'package:get/get.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:amap_flutter_map/amap_flutter_map.dart';
 import 'package:amap_flutter_base/amap_flutter_base.dart';
-import 'package:star_lock/permission/permission_dialog.dart';
+import 'package:star_lock/widget/permission/permission_dialog.dart';
 
 import '../../../../appRouters.dart';
 import '../../../../app_settings/app_colors.dart';

star_lock/lib/mine/addLock/nearbyLock/nearbyLock_logic.dart

@@ -14,8 +14,8 @@ import 'package:star_lock/blue/io_protocol/io_getPublicKey.dart';
 import 'package:star_lock/blue/io_protocol/io_otaUpgrade.dart';
 import 'package:star_lock/blue/io_protocol/io_processOtaUpgrade.dart';
 import 'package:star_lock/mine/addLock/nearbyLock/nearbyLock_page.dart';
-import 'package:star_lock/permission/permission_dialog.dart';
 import 'package:star_lock/tools/baseGetXController.dart';
+import 'package:star_lock/widget/permission/permission_dialog.dart';
 
 import '../../../appRouters.dart';
 import '../../../app_settings/app_settings.dart';

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';

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 {

star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_logic.dart

@@ -6,7 +6,7 @@ import 'package:permission_handler/permission_handler.dart';
 import 'package:star_lock/app_settings/app_settings.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_entity.dart';
 import 'package:star_lock/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_state.dart';
-import 'package:star_lock/permission/permission_dialog.dart';
+import 'package:star_lock/widget/permission/permission_dialog.dart';
 import '../../../../network/api_repository.dart';
 import '../../../../tools/baseGetXController.dart';
 import '../../../tools/eventBusEventManage.dart';

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 {

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 {

star_lock/lib/starLockApplication/starLockApplication.dart

@@ -3,8 +3,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';

star_lock/lib/widget/star_input_formatter.dart

@@ -1,13 +0,0 @@
-import 'package:flutter/services.dart';
-
-class StarInputFormatter extends TextInputFormatter {
-  @override
-  TextEditingValue formatEditUpdate(
-      TextEditingValue oldValue, TextEditingValue newValue) {
-    // 将新输入的文本转换为星号
-    return TextEditingValue(
-      text: '*' * newValue.text.length,
-      selection: TextSelection.collapsed(offset: newValue.text.length),
-    );
-  }
-}