From: liangzhenying <867174124@qq.com>
Date: Thu, 22 Aug 2024 09:23:17 +0000 (+0800)
Subject: hid过滤异常数据
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fheads%2Fdev;p=mirrors%2FMouseSdk-TLW.git

hid过滤异常数据
---

diff --git a/MouseSdk/AiMouseSdk/AiMouseSdk/TlwMouseSdk.m b/MouseSdk/AiMouseSdk/AiMouseSdk/TlwMouseSdk.m
index 17654f5..ae0162e 100644
--- a/MouseSdk/AiMouseSdk/AiMouseSdk/TlwMouseSdk.m
+++ b/MouseSdk/AiMouseSdk/AiMouseSdk/TlwMouseSdk.m
@@ -335,6 +335,10 @@
 #pragma mark - hid
 - (void)hidReceiveDeviceData:(NSData *)data{
 //    0x05fff1fec09f0114ef
+    if (data.length < 7) {
+        [self showLog:@"收到异常收据"];
+        return;
+    }
     uint8 type;
     [[data subdataWithRange:NSMakeRange(5, 1)] getBytes:&type length:1];
     
diff --git a/MouseSdk/MouseSdk.xcodeproj/project.pbxproj b/MouseSdk/MouseSdk.xcodeproj/project.pbxproj
index 65632ae..69dadec 100644
--- a/MouseSdk/MouseSdk.xcodeproj/project.pbxproj
+++ b/MouseSdk/MouseSdk.xcodeproj/project.pbxproj
@@ -68,7 +68,7 @@
 		182B548C2BB7EC9B009F53B6 /* TlwDeviceManger.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TlwDeviceManger.m; sourceTree = "<group>"; };
 		1867E5A72BB2706F008FC5FB /* TlwHidManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TlwHidManager.h; sourceTree = "<group>"; };
 		1867E5A82BB2706F008FC5FB /* TlwHidManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TlwHidManager.m; sourceTree = "<group>"; };
-		18BF1DCA2B81AB7C00B8D90F /* MouseSdk.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MouseSdk.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		18BF1DCA2B81AB7C00B8D90F /* TlwSdk.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TlwSdk.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		18BF1DCD2B81AB7C00B8D90F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		18BF1DCE2B81AB7C00B8D90F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		18BF1DD02B81AB7C00B8D90F /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
@@ -152,7 +152,7 @@
 		18BF1DCB2B81AB7C00B8D90F /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				18BF1DCA2B81AB7C00B8D90F /* MouseSdk.app */,
+				18BF1DCA2B81AB7C00B8D90F /* TlwSdk.app */,
 				18BF1DDF2B81AB8000B8D90F /* MouseSdkTests.xctest */,
 				18BF1DE92B81AB8000B8D90F /* MouseSdkUITests.xctest */,
 			);
@@ -250,7 +250,7 @@
 			);
 			name = MouseSdk;
 			productName = MouseSdk;
-			productReference = 18BF1DCA2B81AB7C00B8D90F /* MouseSdk.app */;
+			productReference = 18BF1DCA2B81AB7C00B8D90F /* TlwSdk.app */;
 			productType = "com.apple.product-type.application";
 		};
 		18BF1DDE2B81AB8000B8D90F /* MouseSdkTests */ = {
@@ -571,6 +571,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = M33X987285;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -594,8 +595,8 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = zhihuishixun.MouseSdk;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = zhihuishixun.MouseSdk.tlw;
+				PRODUCT_NAME = TlwSdk;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "MouseSdk/MouseSdk-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -616,6 +617,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = M33X987285;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -640,8 +642,8 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = zhihuishixun.MouseSdk;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_BUNDLE_IDENTIFIER = zhihuishixun.MouseSdk.tlw;
+				PRODUCT_NAME = TlwSdk;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "MouseSdk/MouseSdk-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/MouseSdk/MouseSdk.xcodeproj/xcshareddata/xcschemes/MouseSdk.xcscheme b/MouseSdk/MouseSdk.xcodeproj/xcshareddata/xcschemes/MouseSdk.xcscheme
index 109fc63..f2bcbc8 100644
--- a/MouseSdk/MouseSdk.xcodeproj/xcshareddata/xcschemes/MouseSdk.xcscheme
+++ b/MouseSdk/MouseSdk.xcodeproj/xcshareddata/xcschemes/MouseSdk.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "18BF1DC92B81AB7C00B8D90F"
-               BuildableName = "MouseSdk.app"
+               BuildableName = "TlwSdk.app"
                BlueprintName = "MouseSdk"
                ReferencedContainer = "container:MouseSdk.xcodeproj">
             </BuildableReference>
@@ -68,7 +68,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "18BF1DC92B81AB7C00B8D90F"
-            BuildableName = "MouseSdk.app"
+            BuildableName = "TlwSdk.app"
             BlueprintName = "MouseSdk"
             ReferencedContainer = "container:MouseSdk.xcodeproj">
          </BuildableReference>
@@ -85,7 +85,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "18BF1DC92B81AB7C00B8D90F"
-            BuildableName = "MouseSdk.app"
+            BuildableName = "TlwSdk.app"
             BlueprintName = "MouseSdk"
             ReferencedContainer = "container:MouseSdk.xcodeproj">
          </BuildableReference>
diff --git a/MouseSdk/MouseSdk/TlwHidManager.m b/MouseSdk/MouseSdk/TlwHidManager.m
index 3ff92c7..51b1411 100644
--- a/MouseSdk/MouseSdk/TlwHidManager.m
+++ b/MouseSdk/MouseSdk/TlwHidManager.m
@@ -54,9 +54,9 @@ const long productID = 0xB008;
     IOHIDManagerScheduleWithRunLoop(self.hidManager, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
     IOReturn ret = IOHIDManagerOpen(self.hidManager, 0L);
     if (ret != kIOReturnSuccess) {
-        NSLog(@"打开设备失败!");
+        NSLog(@"打开hid失败!");
     }else{
-        NSLog(@"打开设备成功!");
+        NSLog(@"打开hid成功!");
     }
     //设置匹配设备
     NSMutableDictionary* dict= [NSMutableDictionary dictionary];