소스 검색

结束统计trace

周睿 2 년 전
부모
커밋
0bb73343a4
3개의 변경된 파일21개의 추가작업 그리고 17개의 파일을 삭제
  1. 2 1
      android/app/src/main/AndroidManifest.xml
  2. 18 15
      lib/view/home/data_detail/data_detail.dart
  3. 1 1
      third_party/common_pub

+ 2 - 1
android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.INTERNET"/>
     <application
-        android:label="track_offical"
+        android:label="小飞龙定向场控端"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity

+ 18 - 15
lib/view/home/data_detail/data_detail.dart

@@ -65,7 +65,8 @@ class DataDetailPage extends StatelessWidget {
             ..cpPunchedColor = cpColor,
         ));
 
-        children.add(ViewMapTrace(map.plugMap, data.traceList));
+        children.add(ViewMapTrace(map.plugMap, data.traceList,
+            controller: c.viewMapTraceController));
       }
 
       children.add(ViewMapTouch(map.plugMap));
@@ -89,26 +90,28 @@ class DataDetailPage extends StatelessWidget {
     final children = <Widget>[];
 
     if (detail != null) {
-      final data = detail.dataChartPage.pace.data
-          .map((e) =>
-              TraceBarData(DataOne(e.x, e.y).toPace())..ts = e.x.milliseconds)
-          .toList();
-      if (data.isNotEmpty) {
-        final ts = data.first.ts - 1.seconds;
-        if (ts > Duration.zero) {
-          data.insert(0, TraceBarData(null)..ts = ts);
-        }
-      }
+      final data =
+          detail.traceList.map((e) => TraceBarData(e.pace)..ts = e.ts).toList();
+
       children.addAll([
+        const SizedBox(height: 8),
         const Text('配速(按时间)'),
-        SizedBox(
-          child: TraceBar(data, controller: c.traceBarController),
-        )
+        TraceBar(
+          data,
+          controller: c.traceBarController,
+          direction: Axis.horizontal,
+          trackWidth: 10,
+          paddingStart: 100,
+          paddingEnd: 100,
+          mask: true,
+          isShowCp: true,
+          cpList: detail.controlPoints,
+        ),
       ]);
     }
 
     return Container(
-      decoration: BoxDecoration(color: Colors.white),
+      decoration: const BoxDecoration(color: Colors.white),
       height: 73,
       width: double.infinity,
       child: Column(children: children),

+ 1 - 1
third_party/common_pub

@@ -1 +1 @@
-Subproject commit 198efb64bb954f4a1fae0b28348df2b064dd3655
+Subproject commit 6ab2a84e79c8b12c85a5dcb15dfef8af08931be4