登录页面Obx修改

.vscode/launch.json

@@ -0,0 +1,85 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "cpnav",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "cpnav (profile mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "cpnav (release mode)",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        },
+        {
+            "name": "pass_track",
+            "cwd": "plugins\\pass_track",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "pass_track (profile mode)",
+            "cwd": "plugins\\pass_track",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "pass_track (release mode)",
+            "cwd": "plugins\\pass_track",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        },
+        {
+            "name": "scence_map",
+            "cwd": "plugins\\scence_map",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "scence_map (profile mode)",
+            "cwd": "plugins\\scence_map",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "scence_map (release mode)",
+            "cwd": "plugins\\scence_map",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        },
+        {
+            "name": "example",
+            "cwd": "plugins\\pass_track\\example",
+            "request": "launch",
+            "type": "dart"
+        },
+        {
+            "name": "example (profile mode)",
+            "cwd": "plugins\\pass_track\\example",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "profile"
+        },
+        {
+            "name": "example (release mode)",
+            "cwd": "plugins\\pass_track\\example",
+            "request": "launch",
+            "type": "dart",
+            "flutterMode": "release"
+        }
+    ]
+}

lib/main.dart

@@ -1,14 +1,26 @@
 import 'package:cpnav/appbar.dart';
+import 'package:cpnav/pages/login/loginprefs.dart';
+import 'package:cpnav/pages/pass_track/controller.dart';
+import 'package:cpnav/pages/pass_track/bottomIcon/iconController.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:scence_map/controller.dart';
+import 'pages/login/login_page.dart';
+import 'pages/login/my_routes.dart';
 import 'pages/pass_track/view.dart';
+import 'service/pile_cm.dart';
 
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
   SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []); //设置全屏
-
+  Get.put(PassTrackController('WXLMB', 'cp_road'));
+  Get.put(IconController());
+  Get.put(LoginPageController());
+  Get.put(AccountLoginController());
+  Get.put(PhoneLoginController());
+  LoginPrefs loginPrefs = LoginPrefs();
+  loginPrefs.removeToken();
   runApp(const MyApp());
 }
 
@@ -21,25 +33,12 @@ class MyApp extends StatelessWidget {
     return MaterialApp(
       title: 'Flutter Demo',
       theme: ThemeData(
-        // This is the theme of your application.
-        //
-        // TRY THIS: Try running your application with "flutter run". You'll see
-        // the application has a purple toolbar. Then, without quitting the app,
-        // try changing the seedColor in the colorScheme below to Colors.green
-        // and then invoke "hot reload" (save your changes or press the "hot
-        // reload" button in a Flutter-supported IDE, or press "r" if you used
-        // the command line to start the app).
-        //
-        // Notice that the counter didn't reset back to zero; the application
-        // state is not lost during the reload. To reset the state, use hot
-        // restart instead.
-        //
-        // This works for code too, not just values: Most code changes can be
-        // tested with just a hot reload.
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
         useMaterial3: true,
       ),
       home: const MyHomePage(title: 'Flutter Demo Home Page'),
+      initialRoute: "home",
+      onGenerateRoute: onGenerateRoute,
     );
   }
 }
@@ -68,9 +67,9 @@ class _MyHomePageState extends State<MyHomePage> {
 
   final _currentIndex = 0.obs;
   final List<Widget> _pages = [
-    PassTrackWidget(
-      date: '',
-    ),
+    PassTrackView(
+        // date: '',
+        ),
     Container(
       color: Colors.green,
     ),

lib/models/login.dart

@@ -1,75 +0,0 @@
-import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
-
-import 'package:cpnav/models/user.dart';
-
-class LoginPrefs extends GetxController {
-  static const String expireStr = "expire"; //用户名
-  static const String tokenStr = "token"; //token
-  static const String phoneStr = "phone";
-  final box = GetStorage(); // 实例化 GetStorage
-
-  Future<String> init() async {
-    await GetStorage.init(); // 初始化 GetStorage
-    return 'ok';
-  }
-
-  void saveExpire(int expire) {
-    box.write(expireStr, expire);
-    update();
-  }
-
-  int getExpire() {
-    return box.read(expireStr) ?? 0;
-  }
-
-  void saveToken(String token) {
-    box.write(tokenStr, token);
-    update();
-  }
-
-  String getToken() {
-    return box.read(tokenStr) ?? "";
-  }
-
-  void removeExpire() {
-    box.remove(expireStr);
-    update();
-  }
-
-  void removeToken() {
-    box.remove(tokenStr);
-    update();
-  }
-
-  void savePhone(String phone) {
-    box.write(phoneStr, phone);
-    update();
-  }
-
-  String getPhone() {
-    return box.read(phoneStr) ?? "";
-  }
-
-  void clearLogin() {
-    box.erase(); // 清除所有数据
-    update();
-  }
-}
-
-class UserController extends GetxController {
-  final box = GetStorage(); // 实例化 GetStorage
-
-  UserModel? getUser() {
-    final userMap = box.read('user');
-    if (userMap != null) {
-      return UserModel.fromJson(userMap);
-    }
-    return null;
-  }
-
-  void setUser(Map user) {
-    box.write('user', user);
-    update();
-  }
-}

lib/pages/login/loginprefs.dart

@@ -1,7 +1,7 @@
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
-import 'package:cpnav/models/user.dart';
+import 'package:cpnav/pages/login/user.dart';
 
 class LoginPrefs extends GetxController {
   static const String expireStr = "expire"; //用户名

lib/pages/login/my_routes.dart

@@ -0,0 +1,48 @@
+//配置路由
+
+import 'package:flutter/material.dart';
+
+import '../../main.dart';
+import 'login_page.dart';
+import 'loginprefs.dart';
+
+/*
+ *  这个方法是固定写法，功能就像是一个拦截器。
+ */
+Route<dynamic>? onGenerateRoute(RouteSettings settings) {
+  Map<String, Widget> routes = {
+    'home': MyHomePage(title: 'Flutter Demo Home Page'), //定义app路径
+    'login': const Login(), //定义login路径
+  };
+
+  String routerName = routeBeforeHook(settings);
+  bool mathMap = false;
+  Route<dynamic>? mathWidget;
+  routes.forEach((key, v) {
+    if (key == routerName) {
+      mathMap = true;
+      mathWidget = MaterialPageRoute(builder: (BuildContext context) => v);
+    }
+  });
+
+  if (mathMap) {
+    return mathWidget;
+  }
+  return MaterialPageRoute(
+      builder: (BuildContext context) => const Text('404'));
+}
+
+String routeBeforeHook(RouteSettings settings) {
+  if (checkToken() == false) {
+    return 'login';
+  } else {
+    return settings.name!;
+  }
+}
+
+bool checkToken() {
+  LoginPrefs loginPrefs = LoginPrefs();
+  String token = loginPrefs.getToken();
+  if ('' != token) return true;
+  return false;
+}

lib/pages/pass_track/bottomIcon/iconContainer.dart

@@ -4,49 +4,17 @@ import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 import 'package:scence_map/controller.dart';
 
+import 'iconController.dart';
+
 ScenceMapController mapController = Get.put(ScenceMapController());
 
-class IconContainer extends StatefulWidget {
-  @override
-  _IconContainerState createState() => _IconContainerState();
-}
-
-class _IconContainerState extends State<IconContainer> {
-  final Map<IconData, Color> _iconColors = {
-    Icons.article: Colors.green,
-    Icons.speed: const Color.fromARGB(255, 166, 182, 149),
-    Icons.thermostat: const Color.fromARGB(255, 166, 182, 149),
-    Icons.zoom_in: const Color.fromARGB(255, 166, 182, 149),
-    Icons.zoom_out: const Color.fromARGB(255, 166, 182, 149),
-    Icons.refresh: const Color.fromARGB(255, 166, 182, 149),
-    Icons.place: const Color.fromARGB(255, 166, 182, 149),
-  };
-  IconData? _selectedIcon;
-
-  void _handleTap1(IconData icon, VoidCallback onTap) {
-    setState(() {
-      _selectedIcon = icon;
-      _iconColors.forEach((key, value) {
-        _iconColors[key] = key == icon
-            ? Colors.green // 点击后变浅的颜色
-            : const Color.fromARGB(255, 166, 182, 149); // 其他图标恢复原色
-      });
-    });
-    onTap();
-  }
-
-  void _handleTap2(IconData icon, VoidCallback onTap) {
-    setState(() {
-      _iconColors[icon] = Colors.green; // 点击后变浅的颜色
-    });
-    onTap();
-    Future.delayed(Duration(milliseconds: 200), () {
-      setState(() {
-        _iconColors[icon] = const Color.fromARGB(255, 166, 182, 149); // 恢复原色
-      });
-    });
-  }
+// class IconContainer extends StatefulWidget {
+//   @override
+//   _IconContainerState createState() => _IconContainerState();
+// }
 
+// class _IconContainerState extends State<IconContainer> {
+class IconContainer extends GetView<IconController> {
   @override
   Widget build(BuildContext context) {
     var isPortrait = MediaQuery.of(context).orientation == Orientation.portrait;
@@ -62,7 +30,7 @@ class _IconContainerState extends State<IconContainer> {
                   decoration: BoxDecoration(
                     color: Colors.transparent,
                     border: Border.all(
-                      color: Color.fromARGB(255, 54, 52, 52),
+                      color: const Color.fromARGB(255, 54, 52, 52),
                       width: 1.0,
                     ),
                     borderRadius: BorderRadius.circular(5.0),
@@ -134,7 +102,7 @@ class _IconContainerState extends State<IconContainer> {
                   decoration: BoxDecoration(
                     color: Colors.transparent,
                     border: Border.all(
-                      color: Color.fromARGB(255, 54, 52, 52),
+                      color: const Color.fromARGB(255, 54, 52, 52),
                       width: 1.0,
                     ),
                     borderRadius: BorderRadius.circular(5.0),
@@ -203,47 +171,51 @@ class _IconContainerState extends State<IconContainer> {
 
   //前三个单选
   Widget _singleChange(IconData icon, VoidCallback onTap) {
-    return Container(
-      width: 33,
-      height: 33,
-      margin: EdgeInsets.symmetric(vertical: 2.0),
-      decoration: BoxDecoration(
-        color: _iconColors[icon],
-        border: Border.all(
-          color: Colors.white,
+    return Obx(() {
+      return Container(
+        width: 33,
+        height: 33,
+        margin: const EdgeInsets.symmetric(vertical: 2.0),
+        decoration: BoxDecoration(
+          color: controller.iconColors[icon],
+          border: Border.all(
+            color: Colors.white,
+          ),
+          borderRadius: BorderRadius.circular(5.0),
         ),
-        borderRadius: BorderRadius.circular(5.0),
-      ),
-      child: InkWell(
-        child: Icon(
-          icon,
-          color: Colors.white,
+        child: InkWell(
+          child: Icon(
+            icon,
+            color: Colors.white,
+          ),
+          onTap: () => controller.handleTap1(icon, onTap),
         ),
-        onTap: () => _handleTap1(icon, onTap),
-      ),
-    );
+      );
+    });
   }
 
   //后三个自动恢复
   Widget _automChange(IconData icon, VoidCallback onTap) {
-    return Container(
-      width: 33,
-      height: 33,
-      margin: EdgeInsets.symmetric(vertical: 2.0),
-      decoration: BoxDecoration(
-        color: _iconColors[icon],
-        border: Border.all(
-          color: Colors.white,
+    return Obx(() {
+      return Container(
+        width: 33,
+        height: 33,
+        margin: const EdgeInsets.symmetric(vertical: 2.0),
+        decoration: BoxDecoration(
+          color: controller.iconColors[icon],
+          border: Border.all(
+            color: Colors.white,
+          ),
+          borderRadius: BorderRadius.circular(5.0),
         ),
-        borderRadius: BorderRadius.circular(5.0),
-      ),
-      child: InkWell(
-        child: Icon(
-          icon,
-          color: Colors.white,
+        child: InkWell(
+          child: Icon(
+            icon,
+            color: Colors.white,
+          ),
+          onTap: () => controller.handleTap2(icon, onTap),
         ),
-        onTap: () => _handleTap2(icon, onTap),
-      ),
-    );
+      );
+    });
   }
 }

lib/pages/pass_track/bottomIcon/iconController.dart

@@ -0,0 +1,41 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+class IconController extends GetxController {
+  final RxMap<IconData, Color> iconColors = {
+    Icons.article: Colors.green,
+    Icons.speed: const Color.fromARGB(255, 166, 182, 149),
+    Icons.thermostat: const Color.fromARGB(255, 166, 182, 149),
+    Icons.zoom_in: const Color.fromARGB(255, 166, 182, 149),
+    Icons.zoom_out: const Color.fromARGB(255, 166, 182, 149),
+    Icons.refresh: const Color.fromARGB(255, 166, 182, 149),
+    Icons.place: const Color.fromARGB(255, 166, 182, 149),
+  }.obs;
+  // IconData? _selectedIcon;
+  late IconData selectedIcon;
+  @override
+  void onInit() {
+    super.onInit();
+    handleTap1(Icons.close, () {}); // 初始时，默认第一个图标为选中状态，并触发onTap事件(空函数, onTap)
+    handleTap2(Icons.close, () {});
+  }
+
+  void handleTap1(IconData icon, VoidCallback onTap) {
+    selectedIcon = icon;
+    iconColors.forEach((key, value) {
+      iconColors[key] = key == icon
+          ? Colors.green // 点击后变浅的颜色
+          : const Color.fromARGB(255, 166, 182, 149); // 其他图标恢复原色
+    });
+    onTap();
+  }
+
+  void handleTap2(IconData icon, VoidCallback onTap) {
+    iconColors[icon] = Colors.green; // 点击后变浅的颜色
+
+    onTap();
+    Future.delayed(Duration(milliseconds: 200), () {
+      iconColors[icon] = const Color.fromARGB(255, 166, 182, 149); // 恢复原色
+    });
+  }
+}

lib/pages/pass_track/controller.dart

@@ -1,26 +1,30 @@
 import 'dart:ui';
-
-
+import "dart:ffi" as ffi;
 import 'package:get/get.dart';
 import 'package:scence_map/controller.dart';
 import 'package:cpnav/service/base.dart';
 import 'package:pass_track/pass_track.dart';
 import 'sevice/file_handle.dart';
 
-
 FileHandle fileHandle = FileHandle();
+ScenceMapController mapcontroller = Get.put(ScenceMapController());
 
 class PassTrackController extends GetxController {
-  int allLen = 0;
+  var tileCount = 0.obs;
+  var tileFirst = 0.obs;
+  var tileLast = 0.obs;
   final mapController = Get.put(ScenceMapController());
 
   String projCode;
   String projType;
+  var speed = 1.obs;
   late final GetServices service;
-  // final PassTrack _passTrackPlugin;
+
   PassTrackController(this.projCode, this.projType);
   Map<String, int> deviceMap = {};
   Map<String, int> coorTransMap = {};
+  // final PassTrack _passTrackPlugin;
+  final PassTrack _passTrackPlugin = PassTrack();
   @override
   void onInit() {
     super.onInit();
@@ -29,6 +33,72 @@ class PassTrackController extends GetxController {
     // loadSideLine();
     loadBindDevice();
     // getHisFileList();
+    var future = getHisFileList(_passTrackPlugin);
+
+    //   var maxLen =
+    //       controller.allLen > 0 ? controller.allLen : 1.0; // 确保 maxLen 大于 0
+    //   _rangevalues = SfRangeValues(0.0, maxLen);
+    //   SchedulerBinding.instance.addPostFrameCallback((_) async {
+    //     sWidth = sqrt(screen.width * screen.width + screen.height * screen.height)
+    //         .ceil();
+
+    //     // scenceMapController.scale = passTrackPlugin.passTrack_getScale() * 1.0;
+    //     fileHandle.date = widget.date;
+    //     await fileHandle.init();
+    //     //在帧绘制完成后执行数据渲染
+    //     // await initPlatformState();
+    //     if (fileHandle.pointData.isNotEmpty) {
+    //       DecodeDataObj obj = fileHandle.pointData[0].obj!;
+    //       scenceMapController.centerXY = Offset(obj.y / 20, obj.x / 20);
+    //     }
+
+    //     for (var item in fileHandle.deviceList) {
+    //       if (item["point"] != null) {
+    //         bits = item["bits"];
+    //         break;
+    //       }
+    //     }
+    //     // passTrackPlugin.map_setCenterDevice(bits);
+    //     setState(() {
+    //       if (fileHandle.pointData.isNotEmpty) {
+    //         maxLength = fileHandle.pointData.length;
+    //         // _value = maxLength;
+    //         _rangevalues = SfRangeValues(0.0, maxLength.toDouble());
+    //       }
+    //     });
+    // });
+
+    var f = initPlatformState();
+
+    f.then((void _) {
+      _passTrackPlugin.setGridColor(const Color.fromARGB(255, 0, 0, 0).value);
+      _passTrackPlugin.drawGrid();
+
+      future.then((value) {
+        _passTrackPlugin.setScale(1);
+        for (var TID in deviceMap.keys) {
+          _passTrackPlugin.addDevice(int.parse(TID), 0);
+        }
+        for (var item in coorTransMap.entries) {
+          print("tid:${item.key} value:${item.value}");
+        }
+        // 统计用时 获取当前时间
+        var start = DateTime.now().millisecondsSinceEpoch;
+        // _passTrackPlugin.generateTile(0, value);
+        _passTrackPlugin.waitForTile(() {
+          var start = DateTime.now().millisecondsSinceEpoch;
+          print("len: ${_passTrackPlugin.allTileCnt()}");
+          tileCount.value = _passTrackPlugin.allTileCnt();
+          // _rangevalues = SfRangeValues(0, _passTrackPlugin.allTileCnt());
+          _passTrackPlugin.playTrack(
+              0, _passTrackPlugin.allTileCnt(), true, 0, ffi.nullptr);
+          var end = DateTime.now().millisecondsSinceEpoch;
+          print("play: ${end - start}");
+        });
+        // _passTrackPlugin.drawGrid();
+        // 获取当前时间
+      });
+    });
   }
 
   loadBindDevice() async {
@@ -90,12 +160,34 @@ class PassTrackController extends GetxController {
       var jsData = await GetServices().getHisFil1(file);
       print("have message");
       int len = fileHandle.resolveJson(jsData, passTrackPlugin);
-      allLen += len;
-      if (allLen >= 20000) {
+      tileCount.value += len;
+      if (tileCount.value >= 20000) {
         break;
       }
     }
     coorTransMap = fileHandle.pointsMap;
-    return allLen;
+    return tileCount.value;
+  }
+
+  Future<void> initPlatformState() async {
+    String platformVersion;
+    try {
+      platformVersion = await _passTrackPlugin.getPlatformVersion() ??
+          'Unknown platform version';
+    } on Exception {
+      platformVersion = 'Failed to get platform version.';
+    }
+    await _passTrackPlugin.create(
+        mapcontroller.height.toInt(), mapcontroller.width.toInt());
+    fileHandle.textureId = await _passTrackPlugin.getTextureId() ?? -1;
+    print("textureId: ${fileHandle.textureId}");
+    print("${mapcontroller.height.toInt()}");
+
+    // if (!mounted) Exception('Failed to get textureId.');
+
+    // setState(() {
+    //   platformVersion = platformVersion;
+    // });
+    return;
   }
 }

lib/pages/pass_track/view.dart

@@ -9,12 +9,13 @@ import 'package:scence_map/controller.dart';
 import 'package:scence_map/scence_map.dart';
 
 import 'package:syncfusion_flutter_sliders/sliders.dart';
-import 'iconContainer.dart';
+import 'bottomIcon/iconContainer.dart';
 import "controller.dart";
 import "package:pass_track/pass_track.dart";
 import "package:pass_track/pass_track_platform_interface.dart";
 import "controller.dart";
 import "dart:ffi" as ffi;
+
 // import '../login_in/connect/bluetooth_page.dart';
 // import '../login_in/connect/config.dart';
 // import '../login_in/connect/connect_type.dart';
@@ -26,131 +27,126 @@ import "dart:ffi" as ffi;
 
 ScenceMapController mapcontroller = Get.put(ScenceMapController());
 
-class PassTrackWidget extends StatefulWidget {
-  final String date;
-  final controller;
-
-  const PassTrackWidget({super.key, required this.date, this.controller});
-
-  @override
-  State<PassTrackWidget> createState() => _PasstrackState();
-}
-
-class _PasstrackState extends State<PassTrackWidget> {
+class PassTrackView extends GetView<PassTrackController> {
   final GlobalKey<PopupMenuButtonState<int>> _popupMenuKey =
       GlobalKey<PopupMenuButtonState<int>>();
-  final controller = Get.put(PassTrackController("WXLMB", "cp_road"));
-  String str = "播放";
-  int sWidth = 800;
-  int sHeight = 800;
-  int bits = -1;
-  int speed = 50;
-  List<int> speedList = [1, 2, 10, 20, 50, 100, 200, 500];
+  // final controller = Get.put(PassTrackController("WXLMB", "cp_road"));
+  final String str = "播放";
+  // int sWidth = 800;
+  // int sHeight = 800;
+  // int bits = -1;
+  // int speed = 50;
+
   // int maxLength = 200;
-  late SfRangeValues _rangevalues;
+  // late SfRangeValues _rangevalues;
   final PassTrack _passTrackPlugin = PassTrack();
 
-  @override
-  initState() {
-    super.initState();
-    var maxLen =
-        controller.allLen > 0 ? controller.allLen : 1.0; // 确保 maxLen 大于 0
-    _rangevalues = SfRangeValues(0.0, maxLen);
-    SchedulerBinding.instance.addPostFrameCallback((_) async {
-      //     sWidth = sqrt(screen.width * screen.width + screen.height * screen.height)
-      //         .ceil();
+  PassTrackView({Key? key}) : super(key: key);
 
-      //     // scenceMapController.scale = passTrackPlugin.passTrack_getScale() * 1.0;
-      //     fileHandle.date = widget.date;
-      //     await fileHandle.init();
-      //     //在帧绘制完成后执行数据渲染
-      //     // await initPlatformState();
-      //     if (fileHandle.pointData.isNotEmpty) {
-      //       DecodeDataObj obj = fileHandle.pointData[0].obj!;
-      //       scenceMapController.centerXY = Offset(obj.y / 20, obj.x / 20);
-      //     }
+  // @override
+  // initState() {
+  //   super.initState();
+  //   var maxLen =
+  //       controller.allLen > 0 ? controller.allLen : 1.0; // 确保 maxLen 大于 0
+  //   _rangevalues = SfRangeValues(0.0, maxLen);
+  //   SchedulerBinding.instance.addPostFrameCallback((_) async {
+  //     sWidth = sqrt(screen.width * screen.width + screen.height * screen.height)
+  //         .ceil();
 
-      //     for (var item in fileHandle.deviceList) {
-      //       if (item["point"] != null) {
-      //         bits = item["bits"];
-      //         break;
-      //       }
-      //     }
-      //     // passTrackPlugin.map_setCenterDevice(bits);
-      //     setState(() {
-      //       if (fileHandle.pointData.isNotEmpty) {
-      //         maxLength = fileHandle.pointData.length;
-      //         // _value = maxLength;
-      //         _rangevalues = SfRangeValues(0.0, maxLength.toDouble());
-      //       }
-      //     });
-    });
-    var f = initPlatformState();
-    var future = controller.getHisFileList(_passTrackPlugin);
-    f.then((void _) {
-      _passTrackPlugin.setGridColor(const Color.fromARGB(255, 0, 0, 0).value);
-      _passTrackPlugin.drawGrid();
+  //     // scenceMapController.scale = passTrackPlugin.passTrack_getScale() * 1.0;
+  //     fileHandle.date = widget.date;
+  //     await fileHandle.init();
+  //     //在帧绘制完成后执行数据渲染
+  //     // await initPlatformState();
+  //     if (fileHandle.pointData.isNotEmpty) {
+  //       DecodeDataObj obj = fileHandle.pointData[0].obj!;
+  //       scenceMapController.centerXY = Offset(obj.y / 20, obj.x / 20);
+  //     }
 
-      future.then((value) {
-        _passTrackPlugin.setScale(1);
-        for (var TID in controller.deviceMap.keys) {
-          _passTrackPlugin.addDevice(int.parse(TID), 0);
-        }
-        for (var item in controller.coorTransMap.entries) {
-          print("tid:${item.key} value:${item.value}");
-        }
-        // 统计用时 获取当前时间
-        var start = DateTime.now().millisecondsSinceEpoch;
-        // _passTrackPlugin.generateTile(0, value);
-        _passTrackPlugin.waitForTile(() {
-          var start = DateTime.now().millisecondsSinceEpoch;
-          print("len: ${_passTrackPlugin.allTileCnt()}");
-          _rangevalues = SfRangeValues(0, _passTrackPlugin.allTileCnt());
-          _passTrackPlugin.playTrack(0, _passTrackPlugin.allTileCnt(), true, 0, ffi.nullptr);
-          var end = DateTime.now().millisecondsSinceEpoch;
-          print("play: ${end - start}");
-        });
-        // _passTrackPlugin.drawGrid();
-        // 获取当前时间
-      });
-    });
-  }
+  //     for (var item in fileHandle.deviceList) {
+  //       if (item["point"] != null) {
+  //         bits = item["bits"];
+  //         break;
+  //       }
+  //     }
+  //     // passTrackPlugin.map_setCenterDevice(bits);
+  //     setState(() {
+  //       if (fileHandle.pointData.isNotEmpty) {
+  //         maxLength = fileHandle.pointData.length;
+  //         // _value = maxLength;
+  //         _rangevalues = SfRangeValues(0.0, maxLength.toDouble());
+  //       }
+  //     });
+  // });
+  // var f = initPlatformState();
+  //   var future = controller.getHisFileList(_passTrackPlugin);
+  //   f.then((void _) {
+  //     _passTrackPlugin.setGridColor(const Color.fromARGB(255, 0, 0, 0).value);
+  //     _passTrackPlugin.drawGrid();
 
-  Future<void> initPlatformState() async {
-    String platformVersion;
-    try {
-      platformVersion = await _passTrackPlugin.getPlatformVersion() ??
-          'Unknown platform version';
-    } on Exception {
-      platformVersion = 'Failed to get platform version.';
-    }
-    await _passTrackPlugin.create(sWidth, sWidth);
-    fileHandle.textureId = await _passTrackPlugin.getTextureId() ?? -1;
-    print("textureId: ${fileHandle.textureId}");
+  //     future.then((value) {
+  //       _passTrackPlugin.setScale(1);
+  //       for (var TID in controller.deviceMap.keys) {
+  //         _passTrackPlugin.addDevice(int.parse(TID), 0);
+  //       }
+  //       for (var item in controller.coorTransMap.entries) {
+  //         print("tid:${item.key} value:${item.value}");
+  //       }
+  //       // 统计用时 获取当前时间
+  //       var start = DateTime.now().millisecondsSinceEpoch;
+  //       // _passTrackPlugin.generateTile(0, value);
+  //       _passTrackPlugin.waitForTile(() {
+  //         var start = DateTime.now().millisecondsSinceEpoch;
+  //         print("len: ${_passTrackPlugin.allTileCnt()}");
+  //         _rangevalues = SfRangeValues(0, _passTrackPlugin.allTileCnt());
+  //         _passTrackPlugin.playTrack(
+  //             0, _passTrackPlugin.allTileCnt(), true, 0, ffi.nullptr);
+  //         var end = DateTime.now().millisecondsSinceEpoch;
+  //         print("play: ${end - start}");
+  //       });
+  //       // _passTrackPlugin.drawGrid();
+  //       // 获取当前时间
+  //     });
+  //   });
+  // }
 
-    if (!mounted) Exception('Failed to get textureId.');
+  // Future<void> initPlatformState() async {
+  //   String platformVersion;
+  //   try {
+  //     platformVersion = await _passTrackPlugin.getPlatformVersion() ??
+  //         'Unknown platform version';
+  //   } on Exception {
+  //     platformVersion = 'Failed to get platform version.';
+  //   }
+  //   await _passTrackPlugin.create(
+  //       mapcontroller.height.toInt(), mapcontroller.width.toInt());
+  //   fileHandle.textureId = await _passTrackPlugin.getTextureId() ?? -1;
+  //   print("textureId: ${fileHandle.textureId}");
 
-    setState(() {
-      platformVersion = platformVersion;
-    });
-    return;
-  }
+  //   if (!mounted) Exception('Failed to get textureId.');
+
+  //   setState(() {
+  //     platformVersion = platformVersion;
+  //   });
+  //   return;
+  // }
 
   @override
   Widget build(BuildContext context) {
     final size = MediaQuery.of(context).size;
     var isPortrait = MediaQuery.of(context).orientation == Orientation.portrait;
+    var controller = this.controller;
     return OrientationBuilder(builder: (context, orientation) {
       return Stack(
         children: [
           ScenceMapView(
             children: [
               Positioned(
-                  top: 0,
-                  left: 0,
+                  top: mapcontroller.top,
+                  left: mapcontroller.left,
                   child: SizedBox(
-                      width: sWidth * 1.0,
-                      height: sWidth * 1.0,
+                      width: mapcontroller.width,
+                      height: mapcontroller.height,
                       // child: Text('Running on: $_platformVersion\n'),
                       child: Texture(textureId: fileHandle.textureId))),
             ],
@@ -164,24 +160,25 @@ class _PasstrackState extends State<PassTrackWidget> {
             bottom: 30,
             child: Container(
               padding: const EdgeInsets.only(bottom: 5),
-              child: SfRangeSlider(
-                min: 0.0,
-                // max: maxLength,
-                max: controller.allLen > 0
-                    ? controller.allLen
-                    : 1.0, // 确保 max 大于 0
-                values: _rangevalues,
-                showTicks: false,
-                showLabels: false,
-                enableTooltip: true,
-                minorTicksPerInterval: 1,
-                stepSize: 1,
-                onChanged: (SfRangeValues values) {
-                  setState(() {
-                    _rangevalues = SfRangeValues(values.start.roundToDouble(),
-                        values.end.roundToDouble());
-                  });
-                },
+              child: Obx(
+                () => SfRangeSlider(
+                  min: 0.0,
+                  // max: maxLength,
+                  max: controller.tileCount.value > 0
+                      ? controller.tileCount.value
+                      : 1.0, // 确保 max 大于 0
+                  values: SfRangeValues(
+                      controller.tileFirst.value, controller.tileLast.value),
+                  showTicks: false,
+                  showLabels: false,
+                  enableTooltip: true,
+                  minorTicksPerInterval: 1,
+                  stepSize: 1,
+                  onChanged: (SfRangeValues values) {
+                    controller.tileFirst.value = values.start.toInt();
+                    controller.tileLast.value = values.end.toInt();
+                  },
+                ),
               ),
             ),
           ),
@@ -195,20 +192,20 @@ class _PasstrackState extends State<PassTrackWidget> {
                   width: 74,
                   child: ElevatedButton(
                     style: ButtonStyle(
-                      backgroundColor: MaterialStateProperty.all<Color?>(
+                      backgroundColor: WidgetStateProperty.all<Color?>(
                         str == "播放" ? Colors.blue : Colors.red,
                       ),
                     ),
                     onPressed: () {
                       if (str == "播放") {
-                        _passTrackPlugin.playTrack(0, 10000, true, 50, ffi.nullptr);
+                        _passTrackPlugin.playTrack(
+                            0, 10000, true, 50, ffi.nullptr);
                       } else {
                         _passTrackPlugin.playPause();
                       }
-                      setState(() {
-                        str = str == "播放" ? "暂停" : "播放";
-                      });
-                      
+                      // setState(() {
+                      //   str = str == "播放" ? "暂停" : "播放";
+                      // });
                     },
                     child: Text(
                       str,
@@ -234,12 +231,14 @@ class _PasstrackState extends State<PassTrackWidget> {
                       child: Row(
                         mainAxisSize: MainAxisSize.min,
                         children: [
-                          Text(
-                            "$speed X",
-                            style: const TextStyle(
-                                fontSize: 11, color: Colors.black),
+                          Obx(
+                            () => Text(
+                              "${controller.speed.value} X",
+                              style: const TextStyle(
+                                  fontSize: 11, color: Colors.black),
+                            ),
                           ),
-                          Container(
+                          SizedBox(
                             width: 25,
                             child: PopupMenuButton<int>(
                               key: _popupMenuKey,
@@ -247,9 +246,7 @@ class _PasstrackState extends State<PassTrackWidget> {
                               icon: const Icon(Icons.arrow_drop_up,
                                   color: Color.fromARGB(255, 47, 48, 47)),
                               onSelected: (int value) {
-                                setState(() {
-                                  speed = value;
-                                });
+                                controller.speed.value = value;
                               },
                               // style: ButtonStyle(
                               //   minimumSize: MaterialStateProperty.all<Size>(
@@ -262,7 +259,8 @@ class _PasstrackState extends State<PassTrackWidget> {
                                   return PopupMenuItem<int>(
                                     height: 30,
                                     value: speed,
-                                    child: Text("$speed X速度"),
+                                    child: Obx(() =>
+                                        Text("${controller.speed.value} X速度")),
                                   );
                                 }).toList();
                               },

lib/service/base.dart

@@ -2,7 +2,8 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:http/http.dart' as http;
 import 'package:http/http.dart';
-import 'loginprefs.dart';
+
+import '../pages/login/loginprefs.dart';
 
 LoginPrefs loginPrefs = LoginPrefs();
 
@@ -10,7 +11,7 @@ class BaseService {
   //创建client实例
   final _client = http.Client();
   final String token =
-      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc1IiOjAsInJvbGVJZHMiOlsiODMiXSwidXNlcm5hbWUiOiJseWNzIiwidXNlcklkIjozNTYsIlBWIjoyLCJvcmciOiJhIiwiaWF0IjoxNzI1NTI2MDc0LCJleHAiOjE3MjY4MjIwNzR9.l47sd4L8OswBcHJxamGe9M5ttWqiukoJvE5QfwPARlw";
+      "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc1IiOjAsInJvbGVJZHMiOlsiODMiXSwidXNlcm5hbWUiOiJseWNzIiwidXNlcklkIjozNTYsIlBWIjoyLCJvcmciOiJhIiwiaWF0IjoxNzI1OTQ5NDUxLCJleHAiOjE3MjcyNDU0NTF9.o3cwloJcWAPclGXMzlmjIMM2x5GhBseToJe99vM4uVA";
 
   // String baseUrl = "http://192.168.1.189:8001";//本地
   String baseUrl = "http://1.82.251.83:8001"; //线上

lib/service/loginprefs.dart

@@ -1,74 +0,0 @@
-import 'package:get_storage/get_storage.dart';
-
-import 'package:cpnav/models/user.dart';
-
-class LoginPrefs {
-  static const String expireStr = "expire"; //用户名
-  static const String tokenStr = "token"; //token
-  static const String phoneStr = "phone";
-  final box = GetStorage(); // 实例化 GetStorage
-
-  Future<String> init() async {
-    await GetStorage.init(); // 初始化 GetStorage
-    return 'ok';
-  }
-
-  void saveExpire(int expire) {
-    box.write(expireStr, expire);
-    // update();
-  }
-
-  int getExpire() {
-    return box.read(expireStr) ?? 0;
-  }
-
-  void saveToken(String token) {
-    box.write(tokenStr, token);
-    // update();
-  }
-
-  String getToken() {
-    return box.read(tokenStr) ?? "";
-  }
-
-  void removeExpire() {
-    box.remove(expireStr);
-    // update();
-  }
-
-  void removeToken() {
-    box.remove(tokenStr);
-    // update();
-  }
-
-  void savePhone(String phone) {
-    box.write(phoneStr, phone);
-    // update();
-  }
-
-  String getPhone() {
-    return box.read(phoneStr) ?? "";
-  }
-
-  void clearLogin() {
-    box.erase(); // 清除所有数据
-    // update();
-  }
-}
-
-class UserController {
-  final box = GetStorage(); // 实例化 GetStorage
-
-  UserModel? getUser() {
-    final userMap = box.read('user');
-    if (userMap != null) {
-      return UserModel.fromJson(userMap);
-    }
-    return null;
-  }
-
-  void setUser(Map user) {
-    box.write('user', user);
-    // update();
-  }
-}

lib/service/user/loginprefs.dart

@@ -1,75 +0,0 @@
-import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
-
-import 'package:cpnav/models/user.dart';
-
-class LoginPrefs extends GetxController {
-  static const String expireStr = "expire"; //用户名
-  static const String tokenStr = "token"; //token
-  static const String phoneStr = "phone";
-  final box = GetStorage(); // 实例化 GetStorage
-
-  Future<String> init() async {
-    await GetStorage.init(); // 初始化 GetStorage
-    return 'ok';
-  }
-
-  void saveExpire(int expire) {
-    box.write(expireStr, expire);
-    update();
-  }
-
-  int getExpire() {
-    return box.read(expireStr) ?? 0;
-  }
-
-  void saveToken(String token) {
-    box.write(tokenStr, token);
-    update();
-  }
-
-  String getToken() {
-    return box.read(tokenStr) ?? "";
-  }
-
-  void removeExpire() {
-    box.remove(expireStr);
-    update();
-  }
-
-  void removeToken() {
-    box.remove(tokenStr);
-    update();
-  }
-
-  void savePhone(String phone) {
-    box.write(phoneStr, phone);
-    update();
-  }
-
-  String getPhone() {
-    return box.read(phoneStr) ?? "";
-  }
-
-  void clearLogin() {
-    box.erase(); // 清除所有数据
-    update();
-  }
-}
-
-class UserController extends GetxController {
-  final box = GetStorage(); // 实例化 GetStorage
-
-  UserModel? getUser() {
-    final userMap = box.read('user');
-    if (userMap != null) {
-      return UserModel.fromJson(userMap);
-    }
-    return null;
-  }
-
-  void setUser(Map user) {
-    box.write('user', user);
-    update();
-  }
-}

plugins/pass_track

@@ -1 +1 @@
-Subproject commit 32d846e70117065ecb483cea80432e407ea9de9c
+Subproject commit ad96316e993e3bbb2ca2b5b360b2fb5b6a50f0d2

plugins/scence_map

@@ -1 +1 @@
-Subproject commit dfc74693602773a5e28d045854047e408b96a55d
+Subproject commit aa1ed2754229ed2bc2aaccfaba074765a55adfd8