feat:lettransceiver annotation

jason
1 parent 671a3d9e
Showing 5 changed files with 116 additions and 56 deletions
HDFwear/OTA/LETransceiver.h
HDFwear/OTA/LETransceiver.m
HDFwear/OTA/OTAUpdateViewController.h
HDFwear/OTA/OTAUpdateViewController.m
HDFwear/OTA/OTAUpdateViewController.xib
@@ -16,16 +16,16 @@ NS_ASSUME_NONNULL_BEGIN
 #define KeyWriteCharacteristicUUID      @"kWriteCharacteristicUUID"
 #define KeyIndicateCharacteristicUUID   @"kIndicateCharacteristicUUID"
-//@protocol LEConnctionDelegate <NSObject>
+@protocol LEConnctionDelegate <NSObject>
 //
 //@required
 //- (void)onFoundPeripheral:(CBPeripheral *) peripheral advertisementData:(NSDictionary *) advertisementData;
 //
 //@optional
-//- (void)onConnectedPeripheral:(CBPeripheral *) peripheral;
+- (void)onConnectedPeripheral:(CBPeripheral *) peripheral;
 //- (void)onDisconnectedPeripheral:(CBPeripheral *) peripheral;
 //
-//@end
+@end
 @protocol LEDataDelegate <NSObject>
@@ -35,9 +35,9 @@ NS_ASSUME_NONNULL_BEGIN
 @end
-@interface LETransceiver : NSObject<CBPeripheralDelegate, CBCentralManagerDelegate>
+@interface LETransceiver : NSObject
-//@property (weak, nonatomic) id<LEConnctionDelegate> connectionDelegate;
+@property (weak, nonatomic) id<LEConnctionDelegate> connectionDelegate;
 @property (weak, nonatomic) id<LEDataDelegate> dataDelegate;
 //- (void)setUUIDs:(NSDictionary *) uuids;
@@ -53,8 +53,8 @@ NS_ASSUME_NONNULL_BEGIN
 // for BluetoothManager to call
 @property (weak, nonatomic) CBCentralManager *centralManager;
-- (void)peripheral:(CBPeripheral *)peripheral didDiscoverCharacteristicsForService:(CBService *)service error:(NSError *)error;
-
+- (void)peripheral:(CBPeripheral *)peripheral didDiscoverCharacteristicsForService:(CBService *)service error:(nullable NSError *)error;
+- (void)closeOTA;
 @end
 NS_ASSUME_NONNULL_END
@@ -13,11 +13,6 @@
 #define BLE_UUID_SERVICE_WRITE  @"e49a25e0-f69a-11e8-8eb2-f2801f1b9fd1"
 #define BLE_UUID_SERVICE_READ   @"e49a28e1-f69a-11e8-8eb2-f2801f1b9fd1"
-#define KeyWriteServiceUUID             @"kWriteServiceUUID"
-#define KeyIndicateServiceUUID          @"kIndicateServiceUUID"
-#define KeyWriteCharacteristicUUID      @"kWriteCharacteristicUUID"
-#define KeyIndicateCharacteristicUUID   @"kIndicateCharacteristicUUID"
-
 @implementation LETransceiver {
     NSString *writeServiceUUID;
     NSString *writeCharacteristicUUID;
@@ -36,6 +31,10 @@
 }
+- (void)closeOTA {
+    [connectedPeripheral setNotifyValue:NO forCharacteristic:characteristicIndicate];
+}
+
 - (id) init {
     self = [super init];
     if (self) {
@@ -72,17 +71,17 @@
 //    if (indicateServiceUUID)
 //        [servicesUUID addObject:indicateServiceUUID];
 //    */
-//    [centralManager scanForPeripheralsWithServices:nil options:options];
+//    [self.centralManager scanForPeripheralsWithServices:nil options:options];
 //}
 //- (void)scanStop {
-//    [centralManager stopScan];
+//    [self.centralManager stopScan];
 //}
 //- (void)connect:(CBPeripheral *)peripheral {
 //    [self scanStop];
 //    
-//    [centralManager connectPeripheral:peripheral options:@{CBConnectPeripheralOptionNotifyOnConnectionKey:@YES}];
+//    [self.centralManager connectPeripheral:peripheral options:@{CBConnectPeripheralOptionNotifyOnConnectionKey:@YES}];
 //    
 //    if (connectTimer) {
 //        [connectTimer invalidate];
@@ -96,20 +95,12 @@
 //    }
 //    
 //    NSLog(@"disconnect %@", peripheral.name);
-//    [centralManager cancelPeripheralConnection:peripheral];
+//    [self.centralManager cancelPeripheralConnection:peripheral];
 //}
 //- (BOOL) isPeripheralConnected:(CBPeripheral *) peripheral {
-//    if (IOS_VERSION >= 7.0) {
-//        if (peripheral.state == CBPeripheralStateConnected) {
-//            return YES;
-//        }
-//    } else {
-//#ifndef __IPHONE_7_0
-//        if (peripheral.isConnected) {
-//            return YES;
-//        }
-//#endif
+//    if (peripheral.state == CBPeripheralStateConnected) {
+//        return YES;
 //    }
 //    return NO;
 //}
@@ -157,7 +148,7 @@
 //    [self disconnect:peripheral];
 //}
-#pragma mark -- CBCentralManagerDelegate
+//#pragma mark -- CBCentralManagerDelegate
 //- (void)centralManagerDidUpdateState:(CBCentralManager *)central {
 //    NSString *messtoshow;
 //    switch (central.state) {
@@ -229,7 +220,7 @@
 //    }
 //}
-#pragma mark -- CBPeripheralDelegate
+//#pragma mark -- CBPeripheralDelegate
 //- (void)peripheral:(CBPeripheral *)peripheral didDiscoverServices:(NSError *)error{
 //    NSLog(@"didDiscoverServices: %@", peripheral.name);
 //    if (error) {
@@ -253,16 +244,16 @@
     }
     NSLog(@"UUID: %@, %@, %@", service.UUID.UUIDString, writeServiceUUID, indicateServiceUUID);
-    if ([service.UUID.UUIDString isEqualToString:writeServiceUUID]) {
+    if ([writeServiceUUID containsString:service.UUID.UUIDString]) {
         for (CBCharacteristic *characteristic in service.characteristics) {
             NSLog(@"DiscoverCharacteristics: %@", characteristic.UUID);
-
+            
             if ([characteristic.UUID.UUIDString isEqualToString:writeCharacteristicUUID])
                 characteristicWrite = characteristic;
         }
     }
-    if ([service.UUID.UUIDString isEqualToString:indicateServiceUUID]) {
+    if ([indicateServiceUUID containsString:service.UUID.UUIDString]) {
         for (CBCharacteristic *characteristic in service.characteristics) {
             NSLog(@"DiscoverCharacteristics: %@", characteristic.UUID);
@@ -278,35 +269,35 @@
         connectedPeripheral = peripheral;
         [connectTimer invalidate];
-//        if(_connectionDelegate && [_connectionDelegate respondsToSelector:@selector(onConnectedPeripheral:)]) {
-//            [_connectionDelegate onConnectedPeripheral:peripheral];
-//        }
+        if(_connectionDelegate && [_connectionDelegate respondsToSelector:@selector(onConnectedPeripheral:)]) {
+            [_connectionDelegate onConnectedPeripheral:peripheral];
+        }
     }
 }
-- (void)peripheral:(CBPeripheral *)peripheral didReadRSSI:(NSNumber *)RSSI error:(nullable NSError *)error {
-    
-}
+//- (void)peripheral:(CBPeripheral *)peripheral didReadRSSI:(NSNumber *)RSSI error:(nullable NSError *)error {
+//    
+//}
-- (void)peripheral:(CBPeripheral *)peripheral didWriteValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
-    
-    if (error) {
-        NSLog(@"%@,%@,Error didWriteValueForCharacteristic:%@",characteristic.UUID,[characteristic value], [error localizedDescription]);
-        return;
-    }
-    
-}
+//- (void)peripheral:(CBPeripheral *)peripheral didWriteValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
+//    
+//    if (error) {
+//        NSLog(@"%@,%@,Error didWriteValueForCharacteristic:%@",characteristic.UUID,[characteristic value], [error localizedDescription]);
+//        return;
+//    }
+//    
+//}
-- (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
-    if (error) {
-        NSLog(@"Error didUpdateValueForCharacteristic:%@", [error localizedDescription]);
-        return;
-    }
-    NSLog(@"didUpdateValueForCharacteristic: %@  %@", characteristic.UUID, characteristic.value);
-    
-    if (_dataDelegate && [_dataDelegate respondsToSelector:@selector(onDataReceive:)]) {
-        [_dataDelegate onDataReceive:[characteristic value]];
-    }
-}
+//- (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
+//    if (error) {
+//        NSLog(@"Error didUpdateValueForCharacteristic:%@", [error localizedDescription]);
+//        return;
+//    }
+//    NSLog(@"didUpdateValueForCharacteristic: %@  %@", characteristic.UUID, characteristic.value);
+//    
+//    if (_dataDelegate && [_dataDelegate respondsToSelector:@selector(onDataReceive:)]) {
+//        [_dataDelegate onDataReceive:[characteristic value]];
+//    }
+//}
 @end
+//
+//  OTAUpdateViewController.h
+//  HDFwear
+//
+//  Created by admin on 2024/1/24.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface OTAUpdateViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  OTAUpdateViewController.m
+//  HDFwear
+//
+//  Created by admin on 2024/1/24.
+//
+
+#import "OTAUpdateViewController.h"
+
+@interface OTAUpdateViewController ()
+
+@end
+
+@implementation OTAUpdateViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="OTAUpdateViewController">
+            <connections>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+        </view>
+    </objects>
+</document>