Changed window size to 6 sec

Protocentral · May 29, 2024 · dc4d3b2 · dc4d3b2
1 parent 89e6e90
commit dc4d3b2
Show file tree

Hide file tree

Showing 11 changed files with 1,378 additions and 544 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -14,7 +14,7 @@ PODS:
     - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
-  - Protobuf (3.26.1)
+  - Protobuf (3.27.0)
   - Reachability (3.7.6)
   - reactive_ble_mobile (0.0.1):
     - Flutter
@@ -69,7 +69,7 @@ SPEC CHECKSUMS:
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
-  Protobuf: a53f5173a603075b3522a5c50be63a67a5f3353a
+  Protobuf: 2c02b2e18bb9040d3bf3fd2cecaefb2a8b55265b
   Reachability: fd0ecd23705e2599e4cceeb943222ae02296cbc6
   reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
   SwiftProtobuf: 5e8349171e7c2f88f5b9e683cb3cb79d1dc780b3

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -407,7 +407,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 73;
 				DEVELOPMENT_TEAM = M86YWF3243;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -424,7 +424,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.protocentral.openview;
 				PRODUCT_NAME = Runner;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -548,7 +548,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 73;
 				DEVELOPMENT_TEAM = M86YWF3243;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -565,7 +565,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.protocentral.openview;
 				PRODUCT_NAME = Runner;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -583,7 +583,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 71;
+				CURRENT_PROJECT_VERSION = 73;
 				DEVELOPMENT_TEAM = M86YWF3243;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -600,7 +600,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 2.0.2;
+				MARKETING_VERSION = 2.0.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.protocentral.openview;
 				PRODUCT_NAME = OpenView;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";

diff --git a/lib/globals.dart b/lib/globals.dart
@@ -16,8 +16,7 @@ class hPi4Global {
 
   static const String UUID_SERVICE_CMD = "01bf7492-970f-8d96-d44d-9023c47faddc";
   static const String UUID_CHAR_CMD = "01bf1527-970f-8d96-d44d-9023c47faddc";
-  static const String UUID_CHAR_CMD_DATA =
-      "01bf1528-970f-8d96-d44d-9023c47faddc";
+  static const String UUID_CHAR_CMD_DATA = "01bf1528-970f-8d96-d44d-9023c47faddc";
 
   static const String UUID_ECG_SERVICE = "00001122-0000-1000-8000-00805f9b34fb";
   static const String UUID_ECG_CHAR = "00001424-0000-1000-8000-00805f9b34fb";
@@ -54,95 +53,23 @@ class hPi4Global {
       TextStyle(fontSize: 14, fontWeight: FontWeight.bold, color: Colors.white);
 
   static const Color hpi4Color = Color(0xFF125871);
+  static Color appBackgroundColor = Colors.grey.shade300;
 
   static String hpi4AppVersion = "";
   static String hpi4AppBuildNumber = "";
 
-  static StreamSubscription<ConnectionStateUpdate> connection = DeviceConnectionState.disconnected as StreamSubscription<ConnectionStateUpdate>;
-}
-
-class WiserGlobal {
-  static const String UUID_SERV_DIS = "0000180a-0000-1000-8000-00805f9b34fb";
-  static const String UUID_SERV_BATT = "0000180f-0000-1000-8000-00805f9b34fb";
-
-  static const String UUID_SERV_TDCS = "cd5c1110-4448-7db8-ae4c-d1da8cba36d0";
-  static const String UUID_CHAR_TDCS = "cd5c1111-4448-7db8-ae4c-d1da8cba36d0";
-
-  static const String UUID_CHAR_DATA = "01bf1528-970f-8d96-d44d-9023c47faddc";
-
-  static const String UUID_CHAR_CMD = "01bf1527-970f-8d96-d44d-9023c47faddc";
-  static const String UUID_CHAR_CMD_DATA =
-      "01bf1528-970f-8d96-d44d-9023c47faddc";
-
-  static const String UUID_SERV_CMD_DATA =
-      "01bf7492-970f-8d96-d44d-9023c47faddc";
-
-  static const String UUID_ECG_SERVICE = "00001122-0000-1000-8000-00805f9b34fb";
-
-  static const String UUID_ECG_CHAR = "00001424-0000-1000-8000-00805f9b34fb";
-
-  static const String UUID_HRV_SERVICE = "01bf7491-970f-8d96-d44d-9023c47faddc";
-  static const String UUID_SERV_STREAM_2 =
-      "cd5c7491-4448-7db8-ae4c-d1da8cba36d0";
-  static const String UUID_STREAM_2 = "01bf1525-970f-8d96-d44d-9023c47faddc";
-
-  static const String UUID_CHAR_BATT = "00002a19-0000-1000-8000-00805f9b34fb";
-  static const String UUID_DIS_FW_REVISION =
-      "00002a26-0000-1000-8000-00805f9b34fb";
-  static const String UUID_SERV_HEALTH_THERM =
-      "00001809-0000-1000-8000-00805f9b34fb";
-
-  static const TextStyle eventStyle =
-      TextStyle(fontSize: 30, fontWeight: FontWeight.bold, color: Colors.white);
-  static const TextStyle cardTextStyle =
-      TextStyle(fontSize: 20, fontWeight: FontWeight.bold, color: Colors.white);
-  static const TextStyle cardValueTextStyle =
-      TextStyle(fontSize: 50, fontWeight: FontWeight.bold, color: Colors.white);
+  static const List<int> sessionLogIndex = [0x50];
+  static const List<int> sessionFetchLogFile = [0x51];
+  static const List<int> sessionLogDelete = [0x52];
+  static const List<int> sessionLogWipeAll = [0x53];
+  static const List<int> getSessionCount = [0x54];
+  static const List<int> getFWVersion = [0x55];
 
-  static const TextStyle cardBlackTextStyle =
-      TextStyle(fontSize: 20, color: Colors.black);
+  static const int CES_CMDIF_TYPE_LOG_IDX = 0x05;
+  static const int CES_CMDIF_TYPE_DATA = 0x02;
+  static const int CES_CMDIF_TYPE_CMD_RSP = 0x06;
 
-  static const TextStyle eventsWhite =
-      TextStyle(fontSize: 14, fontWeight: FontWeight.bold, color: Colors.white);
-
-  static const Color hpi4Color = Color(0xFF125871);
-
-  static Color appBarColor = Colors.black38;
-  static Color appBackgroundColor = Colors.grey.shade300;
-
-  static const List<int> tdcsStartCommand = [
-    0x01,
-    0x00,
-    0x00,
-    0x00,
-    0x64,
-    0x00,
-    0x00,
-    0x27,
-    0x10,
-    0x00,
-    0x00,
-    0x00,
-    0x64,
-    0x00,
-    0x00,
-    0x03,
-    0xE8,
-  ];
-
-  static const List<int> tdcsSaveSessionCommand = [0x20];
-  static const List<int> tpcsSaveSessionCommand = [0x21];
-
-  static const List<int> tdcsOTACommand = [0x02];
-
-  static const List<int> tdcsStopCommand = [0xF0];
-
-  static const List<int> tdcsPauseCommand = [0x05];
-
-  static const List<int> tdcsResumeCommand = [0x06];
-
-  static String hpi4AppVersion = "";
-  static String hpi4AppBuildNumber = "";
+  static StreamSubscription<ConnectionStateUpdate> connection = DeviceConnectionState.disconnected as StreamSubscription<ConnectionStateUpdate>;
 }
 
 class BatteryLevelPainter extends CustomPainter {
@@ -257,4 +184,4 @@ class LoadingIndicator extends StatelessWidget {
       textAlign: TextAlign.center,
     );
   }
-}
+}
diff --git a/lib/home.dart b/lib/home.dart
@@ -826,7 +826,7 @@ class _HomePageState extends State<HomePage> {
   Widget build(BuildContext context) {
     SizeConfig().init(context);
     return Scaffold(
-        backgroundColor: WiserGlobal.appBackgroundColor,
+        backgroundColor: hPi4Global.appBackgroundColor,
         drawer: _buildAppDrawer(),
         appBar: AppBar(
           backgroundColor: hPi4Global.hpi4Color,