Browse Source

代码命名规范,review:jimmy

loki.wu 2 years ago
parent
commit
e67d5e7deb

+ 1 - 2
lib/view/measure/measure_config/widgets/has_selected_setting_dialog.dart

@@ -2,7 +2,6 @@ import 'package:fis_i18n/i18n.dart';
 import 'package:fis_jsonrpc/rpc.dart';
 import 'package:fis_measure/interfaces/process/items/terms.dart';
 import 'package:fis_theme/theme.dart';
-import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
 import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:flutter/material.dart';
@@ -11,7 +10,7 @@ import 'package:get/get.dart';
 
 ///选中设置对话框
 class HasSelectedSettingDialog extends FStatelessWidget
-    implements FPage {
+    implements FInteractiveContainer {
   const HasSelectedSettingDialog({
     Key? key,
     required this.name,

+ 9 - 9
lib/view/measure/measure_config/widgets/measure_configuration_style.dart

@@ -6,8 +6,8 @@ import 'package:fis_measure/process/workspace/measure_data_controller.dart';
 import 'package:fis_measure/view/cursor.dart';
 import 'package:fis_measure/view/gesture/positioned_cursor.dart';
 import 'package:fis_theme/theme.dart';
-import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
+import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
@@ -42,13 +42,13 @@ MeasureCursorType getMeasureSystemSettingCursorType(
 class PatternDialog extends StatelessWidget {
   PatternDialog({
     Key? key,
-    required this.parent,
+    required this.businessParent,
   }) : super(key: key);
   final MeasureSystemSettingDTO measureSystemSetting =
       MeasureSystemSettingDTO();
 
   ///父级节点
-  final FPage parent;
+  final FInteractiveContainer businessParent;
 
   /// 测量数据
   final measureData = Get.find<MeasureDataController>();
@@ -86,7 +86,7 @@ class PatternDialog extends StatelessWidget {
               horizontal: 15,
             ),
             child: PatternBody(
-              parent: parent,
+              businessParent: businessParent,
               measureSystemSetting: measureData.measureSystemSetting,
             ))
       ],
@@ -117,12 +117,12 @@ class MeasureTextSize {
 class PatternBody extends FStatefulWidget {
   const PatternBody({
     Key? key,
-    required this.parent,
+    required this.businessParent,
     required this.measureSystemSetting,
   }) : super(key: key);
 
   ///父级节点
-  final FPage parent;
+  final FInteractiveContainer businessParent;
   final MeasureSystemSettingDTO measureSystemSetting;
   @override
   FState<PatternBody> createState() => _PatternBodyState();
@@ -212,7 +212,7 @@ class _PatternBodyState extends FState<PatternBody> {
                 title: i18nBook.measure.rulerType.t,
                 item: _PatternItemRadio(
                     tabList: C_MEASURE_CURSOR_TYPE,
-                    parent: widget.parent,
+                    businessParent: widget.businessParent,
                     value: getMeasureSystemSettingCursorType(
                       widget.measureSystemSetting.cursorType,
                     ),
@@ -231,7 +231,7 @@ class _PatternBodyState extends FState<PatternBody> {
                 title: i18nBook.measure.rulerSize.t,
                 item: _PatternItemRadio(
                   tabList: C_MEASURE_CURSOR_SIZE,
-                  parent: widget.parent,
+                  businessParent: widget.businessParent,
                   value: widget.measureSystemSetting.cursorSize,
                   onChangeState: (value) {
                     setState(() {
@@ -246,7 +246,7 @@ class _PatternBodyState extends FState<PatternBody> {
                 item: _PatternItemRadio(
                   tabList: C_MEASURE_CURSOR_SIZE,
                   value: widget.measureSystemSetting.shapeCursorSize,
-                  parent: widget.parent,
+                  businessParent: widget.businessParent,
                   onChangeState: (value) {
                     setState(() {
                       measureData.measureSystemSetting.shapeCursorSize = value;

+ 3 - 3
lib/view/measure/measure_config/widgets/measure_configuration_style_components.dart

@@ -81,10 +81,10 @@ class _PatternItemRadio extends FStatelessWidget {
   final ValueCallback onChangeState;
 
   ///父级节点
-  final FPage parent;
+  final FInteractiveContainer businessParent;
   const _PatternItemRadio({
     Key? key,
-    required this.parent,
+    required this.businessParent,
     required this.tabList,
     required this.value,
     required this.onChangeState,
@@ -126,7 +126,7 @@ class _PatternItemRadio extends FStatelessWidget {
             var tab = tabList[index];
             return FElevatedButton(
               name: "$tab",
-              businessParent: parent,
+              businessParent: businessParent,
               onPressed: () {
                 if (tabList[index] != value) onChangeState.call(tabList[index]);
               },

+ 3 - 1
lib/view/measure/measure_config/widgets/measurement_tool_selection.dart

@@ -11,7 +11,8 @@ import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class SelectModulePage extends FStatefulWidget implements FPage {
+class SelectModulePage extends FStatefulWidget
+    implements FInteractiveContainer {
   final List<ItemMetaGroup> itemMetaListGroup;
 
   /// 选中的测量项
@@ -20,6 +21,7 @@ class SelectModulePage extends FStatefulWidget implements FPage {
   @override
   final String pageName = 'SelectModulePage';
   SelectModulePage({
+    super.key,
     required this.itemMetaListGroup,
     required this.chooseMeasureList,
   });

+ 4 - 1
lib/view/measure/measure_search_input.dart

@@ -7,12 +7,15 @@ import 'package:fis_measure/utils/prompt_box.dart';
 import 'package:fis_measure/view/measure/tool_chest_title.dart';
 import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
+import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-class LeftSelectInput extends FStatefulWidget implements FPage {
+class LeftSelectInput extends FStatefulWidget implements FInteractiveContainer {
   @override
   final String pageName = 'LeftSelectInput';
+
+  const LeftSelectInput({super.key});
   @override
   FState<LeftSelectInput> createState() => _LeftSelectInputState();
 }

+ 3 - 2
lib/view/measure/measure_tool.dart

@@ -11,14 +11,15 @@ import 'package:fis_measure/process/workspace/measure_handler.dart';
 import 'package:fis_measure/view/measure/combo_widget.dart';
 import 'package:fis_measure/view/measure/measure_view_controller.dart';
 import 'package:fis_measure/view/player/controller.dart';
-import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
+import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:vid/us/vid_us_image.dart';
 
 /// 测量项页面
-class LeftSiderSelectMeasure extends FStatefulWidget implements FPage {
+class LeftSiderSelectMeasure extends FStatefulWidget
+    implements FInteractiveContainer {
   const LeftSiderSelectMeasure({Key? key}) : super(key: key);
   @override
   final String pageName = 'LeftSiderSelectMeasure';

+ 4 - 2
lib/view/measure/measure_view.dart

@@ -25,6 +25,7 @@ import 'package:fis_measure/view/measure/tool_chest_title.dart';
 import 'package:fis_measure/view/player/control_board/operate_bar.dart';
 import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
+import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:fis_ui/widgets/layout/offstage.dart';
 
 import 'package:flutter/material.dart';
@@ -384,7 +385,8 @@ class _MeasureMainPageState extends State<MeasureMainPage> {
 }
 
 /// 测量左边操作页面
-class _MeasureLeftBoard extends StatefulWidget implements FPage {
+class _MeasureLeftBoard extends StatefulWidget
+    implements FInteractiveContainer {
   const _MeasureLeftBoard({Key? key, this.needRouterBack}) : super(key: key);
   @override
   final String pageName = 'MeasureLeftBoard';
@@ -502,7 +504,7 @@ class _MeasureLeftBoardState extends State<_MeasureLeftBoard> {
           child: FContainer(
             width: 300,
             key: UniqueKey(),
-            child: LeftSelectInput(),
+            child: const LeftSelectInput(),
           ),
         ),
         FOffstage(

+ 4 - 3
lib/view/measure/tool_chest_title.dart

@@ -11,8 +11,8 @@ import 'package:fis_measure/view/measure/measure_config/widgets/measure_configur
 import 'package:fis_measure/view/measure/measure_view_controller.dart';
 import 'package:fis_measure/view/player/controller.dart';
 import 'package:fis_theme/theme.dart';
-import 'package:fis_ui/base_define/page.dart';
 import 'package:fis_ui/index.dart';
+import 'package:fis_ui/interface/interactive_container.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:vid/us/vid_us_image.dart';
@@ -71,7 +71,8 @@ class LeftSiderHold extends StatelessWidget implements FWidget {
 }
 
 /// 测量样式 和配置
-class LeftSiderHoldAllStyleConfig extends StatelessWidget implements FPage {
+class LeftSiderHoldAllStyleConfig extends StatelessWidget
+    implements FInteractiveContainer {
   const LeftSiderHoldAllStyleConfig({Key? key, this.ifHideConfig = false})
       : super(key: key);
   final bool ifHideConfig; // 是否隐藏测量项配置入口
@@ -87,7 +88,7 @@ class LeftSiderHoldAllStyleConfig extends StatelessWidget implements FPage {
           onPressed: () {
             Get.dialog(
               PatternDialog(
-                parent: this,
+                businessParent: this,
               ),
             );
           },

+ 18 - 16
pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: archive
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.3.2"
+    version: "3.3.4"
   args:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
       name: asn1lib
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.2"
+    version: "1.3.0"
   async:
     dependency: transitive
     description:
@@ -147,8 +147,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "6dae11a"
-      resolved-ref: "6dae11a15145a01f3bb79e14fa3f7d4164974b10"
+      ref: "0cae8ae"
+      resolved-ref: "0cae8ae75db5dc56aac30e8a50da81cd637590a3"
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_i18n.git"
     source: git
     version: "0.0.1"
@@ -165,8 +165,8 @@ packages:
     dependency: "direct overridden"
     description:
       path: "."
-      ref: "86e2aafddf"
-      resolved-ref: "86e2aafddfce866621ff8679d84042262f4054b4"
+      ref: "6fb7b0308a"
+      resolved-ref: "6fb7b0308a924fb9b0800a2d0ab59a2ca13d3ba4"
       url: "http://git.ius.plus/bakamaka.guan/fis_lib_business_components.git"
     source: git
     version: "0.0.1"
@@ -191,9 +191,11 @@ packages:
   fis_ui:
     dependency: "direct main"
     description:
-      path: "../fis_lib_ui"
-      relative: true
-    source: path
+      path: "."
+      ref: d8c8012
+      resolved-ref: d8c8012a515a9e57ec37478c499d613a4c36d6e5
+      url: "http://git.ius.plus/Project-Wing/fis_lib_ui.git"
+    source: git
     version: "0.0.1"
   fis_vid:
     dependency: "direct main"
@@ -388,7 +390,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.1.5"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
@@ -533,7 +535,7 @@ packages:
       name: source_span
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
@@ -547,7 +549,7 @@ packages:
       name: stream_channel
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
@@ -575,7 +577,7 @@ packages:
       name: test_api
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.14"
   typed_data:
     dependency: transitive
     description:
@@ -659,14 +661,14 @@ packages:
       name: uuid
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   vid:
     dependency: "direct main"
     description:
@@ -724,7 +726,7 @@ packages:
       name: win32
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "3.1.1"
   xdg_directories:
     dependency: transitive
     description: