|
@@ -17,6 +17,7 @@ import 'package:fis_measure/utils/canvas.dart';
|
|
|
import 'package:fis_measure/values/colors.dart';
|
|
|
import 'package:fis_measure/view/button_group/button_group.dart';
|
|
|
import 'package:fis_measure/view/gesture/annotation/annotation_gesture.dart';
|
|
|
+import 'package:fis_measure/view/gesture/touch_gesture.dart';
|
|
|
import 'package:fis_measure/view/measure/capture_image.dart';
|
|
|
import 'package:fis_measure/view/measure/measure_result.dart';
|
|
|
import 'package:fis_measure/view/mobile_view/controller/mobile_measure_view_state_controller.dart';
|
|
@@ -303,18 +304,18 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
|
|
|
/// 2 顶部菜单栏(MobileTopMenu)
|
|
|
/// 3 底部菜单栏(ifShowBottomMenu)
|
|
|
/// 4 右侧操作面板(MobileRightPanel)
|
|
|
- /// +-------------------------------------------+
|
|
|
- /// | 2 | |
|
|
|
- /// |------------------------------------| |
|
|
|
- /// | | |
|
|
|
- /// | | 4 |
|
|
|
- /// | 1 | |
|
|
|
- /// | | |
|
|
|
- /// |------------------------------------|------|
|
|
|
- /// | 3 |
|
|
|
- /// +-------------------------------------------+
|
|
|
- /// 除了(1)之外,可以定义其他每个分区的尺寸 (width, height) : (W2, H2)、(W3, H3)、(W4, H4)
|
|
|
- /// (2) H2 : 50, W2 : 100%, 左侧设置 20 的 padding
|
|
|
+ /// 5 可变区域,播放器状态下,5 属于 4,非播放器状态下,5 属于 2
|
|
|
+ /// +------------------------------------+-----+
|
|
|
+ /// | 2 | 5 |
|
|
|
+ /// |------------------------------------+-----|
|
|
|
+ /// | | |
|
|
|
+ /// | 1 | 4 |
|
|
|
+ /// | | |
|
|
|
+ /// |------------------------------------+-----|
|
|
|
+ /// | 3 |
|
|
|
+ /// +------------------------------------------+
|
|
|
+ /// 除了【区域1】之外,可以定义其他每个分区的尺寸 (width, height) : (W2, H2)、(W3, H3)、(W4, H4)
|
|
|
+ /// 【区域2】 H2 : 50, W2 : 100%, 左侧设置 20 的 padding
|
|
|
///
|
|
|
|
|
|
@override
|
|
@@ -368,11 +369,12 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
|
|
|
),
|
|
|
LayoutId(
|
|
|
id: _LayerLayoutIds.result,
|
|
|
- child: const FittedBox(
|
|
|
- child: SizedBox(
|
|
|
- height: 200,
|
|
|
- width: 140,
|
|
|
- child: MeasureResultPanel())),
|
|
|
+ child: const SizedBox(
|
|
|
+ height: 200,
|
|
|
+ width: 140,
|
|
|
+ child: MeasureResultPanel(
|
|
|
+ resultFontSize: 12,
|
|
|
+ )),
|
|
|
),
|
|
|
// if (!isCaptureState)
|
|
|
// LayoutId(
|
|
@@ -411,7 +413,7 @@ class _MobileMeasureMainViewState extends State<MobileMeasureMainView> {
|
|
|
}
|
|
|
return inAnnotation
|
|
|
? const AnnotationGestureLayer()
|
|
|
- : const MeasureMouseGesturePanel();
|
|
|
+ : const MeasureTouchGesturePanel();
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -447,7 +449,7 @@ class _LayerLayoutDelegate extends MultiChildLayoutDelegate {
|
|
|
layoutLayer(_LayerLayoutIds.gesture, offset, renderSize);
|
|
|
layoutLayer(
|
|
|
_LayerLayoutIds.result,
|
|
|
- const Offset(10, 50),
|
|
|
+ const Offset(10, 50), // H2 : 50
|
|
|
renderSize,
|
|
|
);
|
|
|
layoutLayer(_LayerLayoutIds.pause, offset, renderSize);
|