修改

ECellBluetooth.xcodeproj/project.pbxproj

@@ -390,7 +390,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -445,7 +445,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 17.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -468,7 +468,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = ECellBluetooth/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -500,7 +500,7 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				INFOPLIST_FILE = ECellBluetooth/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ECellBluetooth.xcodeproj/xcuserdata/ecell.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -7,22 +7,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "D89A85EC-75D9-4DC0-83EF-125CA01AB55C"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "ECellBluetooth/ECellBLEDataParse.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "58"
-            endingLineNumber = "58"
-            landmarkName = "+parse:cmd:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "75C03F9E-0BD8-4964-ADAF-18AECBA3D905"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"

ECellBluetooth/ECellBLEEnum.h

@@ -87,6 +87,7 @@ typedef NS_ENUM(NSInteger, ECell_BLE_REPORT_COMMAND) {
     ECell_BLE_REPORT_COMMAND_realBloodOxyge,
     ECell_BLE_REPORT_COMMAND_cameraControl,
     ECell_BLE_REPORT_COMMAND_findPhone,
+    ECell_BLE_REPORT_COMMAND_realSport,
 };
 
 #endif /* Enum_h */

ECellBluetooth/ECellBluetoothDelegate.h

@@ -113,6 +113,15 @@ didUpdateNotificationStateForCharacteristic:(CBCharacteristic *)characteristic
                       error:(nullable NSError *)error;
 
 
+/**
+ *  @method 设备主动上报数据
+ *
+ *  @param reportCmd        数据类型指令
+ *  @param json    上报数据
+ */
+- (void)getDeviceReportData:(ECell_BLE_REPORT_COMMAND)reportCmd
+                       json:(NSDictionary *)json;
+
 
 @end
 

ECellBluetooth/ECellBluetoothManager.h

@@ -38,6 +38,9 @@ NS_ASSUME_NONNULL_BEGIN
 /** 请求结果回调 */
 @property (nonatomic, copy  ) ResultBlock result;
 
+/** 监听设备上报数据 */
+@property (nonatomic, copy  ) ResultReportBlock resultReportBlock;
+
 
 /**
  蓝牙是否开启 | Is Bluetooth enabled?

ECellBluetooth/ECellBluetoothManager.m

@@ -38,8 +38,7 @@
 @property (nonatomic, strong) NSMutableData *currenData;
 /** 总数据包 */
 @property (nonatomic, strong) NSMutableData *totalData;
-/** 监听设备上报数据 */
-@property (nonatomic, copy  ) ResultReportBlock resultReportBlock;
+
 /** 重连外设 */
 @property (nonatomic,strong) CBPeripheral *reconnectPeripheral;
 // 外部只读属性内部重新声明
@@ -427,15 +426,27 @@
                 reportCmd = ECell_BLE_REPORT_COMMAND_findPhone;
                 break;
                 
+            case ECell_BLECMD_KEY_realTimesync:
+            case ECell_BLECMD_KEY_syncHealth:
+                reportCmd = ECell_BLE_REPORT_COMMAND_realSport;
+                break;
             default:
-                // 回复设备发出通知
-                [self checkCRCHandleWithData:receiveData confirm:YES];
-                return;
+//                // 回复设备发出通知
+//                [self checkCRCHandleWithData:receiveData confirm:YES];
+//                return;
+                break;
         }
+        if (IsDelegate(self.delegate, getDeviceReportData:json:)) {
+            [self.delegate getDeviceReportData:reportCmd json:dict];
+        }
+        
         if (self.resultReportBlock) {
             self.resultReportBlock(reportCmd, dict);
         }
         
+        // 回复设备发出通知
+        [self checkCRCHandleWithData:receiveData confirm:YES];
+        return;
     }
 }
 

Products/ECellBluetooth.framework/Headers/ECellBLEEnum.h

@@ -87,6 +87,7 @@ typedef NS_ENUM(NSInteger, ECell_BLE_REPORT_COMMAND) {
     ECell_BLE_REPORT_COMMAND_realBloodOxyge,
     ECell_BLE_REPORT_COMMAND_cameraControl,
     ECell_BLE_REPORT_COMMAND_findPhone,
+    ECell_BLE_REPORT_COMMAND_realSport,
 };
 
 #endif /* Enum_h */

Products/ECellBluetooth.framework/Headers/ECellBluetoothDelegate.h

@@ -113,6 +113,15 @@ didUpdateNotificationStateForCharacteristic:(CBCharacteristic *)characteristic
                       error:(nullable NSError *)error;
 
 
+/**
+ *  @method 设备主动上报数据
+ *
+ *  @param reportCmd        数据类型指令
+ *  @param json    上报数据
+ */
+- (void)getDeviceReportData:(ECell_BLE_REPORT_COMMAND)reportCmd
+                       json:(NSDictionary *)json;
+
 
 @end
 

Products/ECellBluetooth.framework/Modules/module.modulemap

@@ -1,6 +1,6 @@
 framework module ECellBluetooth {
   umbrella header "ECellBluetooth.h"
-
   export *
+
   module * { export * }
 }

Products/ECellBluetooth.framework/_CodeSignature/CodeResources

@@ -14,7 +14,7 @@
 		</data>
 		<key>Headers/ECellBLEEnum.h</key>
 		<data>
-		m6A87x1MRIUkyc9cfOpHA9WaSR0=
+		QfmdeF5p/Glh5GSwQ6MknKnZFPc=
 		</data>
 		<key>Headers/ECellBLEItem.h</key>
 		<data>
@@ -30,7 +30,7 @@
 		</data>
 		<key>Headers/ECellBluetoothDelegate.h</key>
 		<data>
-		k9S4OB2a3mdpjNgOoPfTWPVCQPI=
+		w22HfxrWfNHg5jz32jodGuQB8XU=
 		</data>
 		<key>Headers/ECellBluetoothManager.h</key>
 		<data>
@@ -50,11 +50,11 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		pqeAbgeeXkEae1qv5mpn+52/dfw=
+		ONiLZXY5aGoZbM7OJqWUeT36rgE=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
-		PXti1YxWgR1LA7cvGarfZyQC84E=
+		Z937lFLV4aKZsABaSmxi2V5Twdk=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -85,11 +85,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			m6A87x1MRIUkyc9cfOpHA9WaSR0=
+			QfmdeF5p/Glh5GSwQ6MknKnZFPc=
 			</data>
 			<key>hash2</key>
 			<data>
-			gI45lfK3rYJoGeECq+sew2gbrTeMBJoHbzrc4POaUVU=
+			newAgSW42VEWxn8tfki2NjKdTWwUkieVkCQyFdcqCAY=
 			</data>
 		</dict>
 		<key>Headers/ECellBLEItem.h</key>
@@ -129,11 +129,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			k9S4OB2a3mdpjNgOoPfTWPVCQPI=
+			w22HfxrWfNHg5jz32jodGuQB8XU=
 			</data>
 			<key>hash2</key>
 			<data>
-			lpEEgNgcLDTq91c/GMW24TgoPqTTX61RQ16ZdsBMQFw=
+			cr6Q8r9PTRlCoBsoBggku04/FP6t2UjF+6jawv/O94c=
 			</data>
 		</dict>
 		<key>Headers/ECellBluetoothManager.h</key>
@@ -184,11 +184,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			PXti1YxWgR1LA7cvGarfZyQC84E=
+			Z937lFLV4aKZsABaSmxi2V5Twdk=
 			</data>
 			<key>hash2</key>
 			<data>
-			kXnRSJtl1OHV/z5LftNX6Y4woDpaITk1mw9gWNUR1Yo=
+			TwgXOS6FaKnuJ6r2Grc43TvUtSIuVeHt6g1aQpESu5g=
 			</data>
 		</dict>
 	</dict>