فهرست منبع

update lib vid

melon.yin 2 سال پیش
والد
کامیت
51190ef85b

+ 4 - 2
lib/main.dart

@@ -7,6 +7,7 @@ import 'package:fis_jsonrpc/rpc.dart';
 import 'package:fis_measure/measure_page_test.dart';
 import 'package:fis_measure/process/layout/configuration.dart';
 import 'package:fis_measure/view/measure/measure_view.dart';
+import 'package:fis_vid/data_channel/test.dart';
 import 'package:fis_vid/index.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -74,9 +75,10 @@ class _MyHomePageState extends State<MyHomePage> {
             ElevatedButton(
               onPressed: () {
                 // ThirdPartVidTest().run();
-                ItemCreateTest().run();
+                // ItemCreateTest().run();
+                VidChannelTest().run();
               },
-              child: const Text("Test 3rd vid"),
+              child: const Text("Function Test"),
             ),
             const SizedBox(height: 10),
             ElevatedButton(

+ 0 - 5
lib/view/frame_view/interface/frame_view.dart

@@ -1,6 +1,4 @@
 import 'dart:typed_data';
-
-import 'package:fis_vid/processors/base.dart';
 import 'package:flutter/cupertino.dart';
 
 abstract class VidFrameViewInterface extends Widget {
@@ -9,13 +7,10 @@ abstract class VidFrameViewInterface extends Widget {
     Key? key,
     this.width,
     this.height,
-    this.processors,
   }) : super(key: key);
 
   final Uint8List data;
 
   final double? width;
   final double? height;
-
-  final List<VidFrameProcessor>? processors;
 }

+ 0 - 5
lib/view/frame_view/native/frame_view.dart

@@ -1,7 +1,6 @@
 import 'dart:typed_data';
 
 import 'package:fis_measure/view/frame_view/interface/frame_view.dart';
-import 'package:fis_vid/processors/base.dart';
 import 'package:flutter/material.dart';
 
 class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
@@ -10,7 +9,6 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
     Key? key,
     this.width,
     this.height,
-    this.processors,
   }) : super(key: key);
 
   @override
@@ -22,9 +20,6 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
   @override
   final double? width;
 
-  @override
-  final List<VidFrameProcessor>? processors;
-
   @override
   Widget build(BuildContext context) {
     return Image.memory(

+ 0 - 5
lib/view/frame_view/stub/frame_view.dart

@@ -1,7 +1,6 @@
 import 'dart:typed_data';
 
 import 'package:fis_measure/view/frame_view/interface/frame_view.dart';
-import 'package:fis_vid/processors/base.dart';
 import 'package:flutter/material.dart';
 
 class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
@@ -10,7 +9,6 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
     Key? key,
     this.width,
     this.height,
-    this.processors,
   }) : super(key: key);
 
   @override
@@ -22,9 +20,6 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
   @override
   final double? width;
 
-  @override
-  final List<VidFrameProcessor>? processors;
-
   @override
   Widget build(BuildContext context) {
     // TODO: implement build

+ 0 - 4
lib/view/frame_view/web/browser.dart

@@ -7,7 +7,6 @@ class _VidFrameViewBroswer extends StatelessWidget
     Key? key,
     this.width,
     this.height,
-    this.processors,
   }) : super(key: key);
 
   @override
@@ -19,9 +18,6 @@ class _VidFrameViewBroswer extends StatelessWidget
   @override
   final double? width;
 
-  @override
-  final List<VidFrameProcessor>? processors;
-
   @override
   Widget build(BuildContext context) {
     return Image.memory(

+ 0 - 7
lib/view/frame_view/web/frame_view.dart

@@ -3,7 +3,6 @@ import 'dart:typed_data';
 import 'package:fis_common/env/env.dart';
 import 'package:fis_measure/view/frame_view/interface/frame_view.dart';
 import 'package:fis_vid/common/env.dart';
-import 'package:fis_vid/processors/base.dart';
 import 'package:flutter/material.dart';
 
 part 'browser.dart';
@@ -15,7 +14,6 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
     Key? key,
     this.width,
     this.height,
-    this.processors,
   }) : super(key: key);
 
   @override
@@ -27,9 +25,6 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
   @override
   final double? width;
 
-  @override
-  final List<VidFrameProcessor>? processors;
-
   @override
   Widget build(BuildContext context) {
     return VidDataHostEnv.isShell
@@ -37,13 +32,11 @@ class VidFrameView extends StatelessWidget implements VidFrameViewInterface {
             data,
             width: width,
             height: height,
-            processors: processors,
           )
         : _VidFrameViewBroswer(
             data,
             width: width,
             height: height,
-            processors: processors,
           );
   }
 }

+ 0 - 4
lib/view/frame_view/web/shell.dart

@@ -7,7 +7,6 @@ class _VidFrameViewShell extends StatelessWidget
     Key? key,
     this.width,
     this.height,
-    this.processors,
   }) : super(key: key);
 
   @override
@@ -19,9 +18,6 @@ class _VidFrameViewShell extends StatelessWidget
   @override
   final double? width;
 
-  @override
-  final List<VidFrameProcessor>? processors;
-
   @override
   Widget build(BuildContext context) {
     return Image.memory(

+ 1 - 11
lib/view/player/controller.dart

@@ -5,7 +5,6 @@ import 'package:fis_common/func/func_proxy.dart';
 import 'package:fis_measure/interfaces/process/player/play_controller.dart';
 import 'package:fis_ui/index.dart';
 import 'package:fis_vid/data_host/data_host.dart';
-import 'package:fis_vid/processors/index.dart';
 import 'package:flutter/foundation.dart';
 import 'package:vid/us/vid_us_image.dart';
 
@@ -49,8 +48,6 @@ class VidPlayerController extends ChangeNotifier implements IPlayerController {
   ///该图像是否需要获取测量项和注释项
   bool ifNeedInit = true;
 
-  final Map<Type, VidFrameProcessor> _processors = {};
-
   @override
   bool get disposed => _disposed;
 
@@ -220,10 +217,6 @@ class VidPlayerController extends ChangeNotifier implements IPlayerController {
     eventHandler.emit(this, VidPlayResetToneEvent());
   }
 
-  T? getProcessor<T extends VidFrameProcessor>() {
-    return _processors[T] as T?;
-  }
-
   void _updateFrame() {
     _handleUpdateFrame
         .throttle(
@@ -254,10 +247,7 @@ class VidPlayerController extends ChangeNotifier implements IPlayerController {
   Future<void> _handleUpdateFrame() async {
     if (_disposed) return;
 
-    _frame = await _dataHost.getFrame(
-      currentFrameIndex,
-      processors: _processors.values.toList(),
-    );
+    _frame = await _dataHost.getFrame(currentFrameIndex);
     emitFrameUpdate();
   }
 

+ 7 - 7
pubspec.lock

@@ -124,8 +124,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "1.0.7+1"
-      resolved-ref: e02a22f15e19da6e6025c593985632e7832eb8e5
+      ref: "1.0.9"
+      resolved-ref: b34e63045625c87ced8b96f92715a06f0a45b279
       url: "http://git.ius.plus:88/Project-Wing/fis_lib_common.git"
     source: git
     version: "0.0.2"
@@ -187,8 +187,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "644e6bdf65"
-      resolved-ref: "644e6bdf658b7d28f2d9f308987f9578b9351387"
+      ref: d13048d65a
+      resolved-ref: d13048d65aa641d60785fd551c8865863ed197c0
       url: "http://git.ius.plus:88/melon.yin/fis_lib_vid.git"
     source: git
     version: "0.0.1"
@@ -638,11 +638,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "54343a18f3"
-      resolved-ref: "54343a18f30abb5b32d3f9f3bd9fe44ade5cabe8"
+      ref: b38bb1b5a4
+      resolved-ref: b38bb1b5a48bc0c04dc1a4bbbd1db1421f82be17
       url: "http://git.ius.plus:88/Project-Wing/flutter_vid.git"
     source: git
-    version: "0.0.1"
+    version: "1.0.2"
   web_socket_channel:
     dependency: transitive
     description:

+ 4 - 4
pubspec.yaml

@@ -44,7 +44,7 @@ dependencies:
   fis_common:
     git:
       url: http://git.ius.plus/Project-Wing/fis_lib_common.git
-      ref: ^1.0.7+1
+      ref: ^1.0.9
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_jsonrpc.git
@@ -75,7 +75,7 @@ dependency_overrides:
   fis_common:
     git:
       url: http://git.ius.plus:88/Project-Wing/fis_lib_common.git
-      ref: 1.0.7+1
+      ref: 1.0.9
     # path: ../fis_lib_common
   fis_ui:
     git:
@@ -84,11 +84,11 @@ dependency_overrides:
   vid:
     git:
       url: http://git.ius.plus:88/Project-Wing/flutter_vid.git
-      ref: 54343a18f3
+      ref: b38bb1b5a4
   fis_vid:
     git:
       url: http://git.ius.plus:88/melon.yin/fis_lib_vid.git
-      ref: 644e6bdf65
+      ref: d13048d65a
     # path: ../fis_lib_vid
   fis_i18n:
     git: