From: liangzhenying <867174124@qq.com> Date: Thu, 29 Feb 2024 09:11:13 +0000 (+0800) Subject: libiotRtc支持mac os11 X-Git-Tag: 阿里鉴权~33 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9e6f356d6653d0e86a87af61c16cee53901dcd69;p=mirrors%2FMouseSdk-MacOS.git libiotRtc支持mac os11 --- diff --git a/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit.xcodeproj/project.pbxproj b/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit.xcodeproj/project.pbxproj index 9627c13..909acb7 100755 --- a/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit.xcodeproj/project.pbxproj +++ b/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit.xcodeproj/project.pbxproj @@ -1968,10 +1968,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_MODULE_VERIFIER = YES; GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../Demo/AliIotConnect/ThirdLib\"", - "\"$(SRCROOT)/AliIotConnectKit/OC\"", - ); + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/AliIotConnectKit/OC\""; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -1980,13 +1977,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../Demo/AliIotConnect/ThirdLib\"", - "\"$(SRCROOT)/../Demo/AliIotConnect/ThirdLib/IotMqtt\"", - "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotMqtt", - "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotMqtt/IotRtc", - "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotRtc", - ); + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotRtc"; MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MODULEMAP_FILE = ""; @@ -2020,10 +2011,7 @@ ENABLE_MODULE_VERIFIER = YES; GCC_OPTIMIZATION_LEVEL = 0; GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../Demo/AliIotConnect/ThirdLib\"", - "\"$(SRCROOT)/AliIotConnectKit/OC\"", - ); + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/AliIotConnectKit/OC\""; INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; @@ -2032,13 +2020,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../Demo/AliIotConnect/ThirdLib\"", - "\"$(SRCROOT)/../Demo/AliIotConnect/ThirdLib/IotMqtt\"", - "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotMqtt", - "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotMqtt/IotRtc", - "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotRtc", - ); + LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/AliIotConnectKit/ThirdLib/IotRtc"; MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MODULEMAP_FILE = ""; diff --git a/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit/ThirdLib/IotRtc/libiotRtc.a b/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit/ThirdLib/IotRtc/libiotRtc.a index 45fc548..f23e4e8 100644 Binary files a/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit/ThirdLib/IotRtc/libiotRtc.a and b/MouseSdk/AliIotConnectKitSDK/AliIotConnectKit/ThirdLib/IotRtc/libiotRtc.a differ diff --git a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate index dee9fce..9ed07e6 100644 Binary files a/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate and b/MouseSdk/MouseSdk.xcworkspace/xcuserdata/apple.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/MouseSdk/MouseSdk/Ble/BleManager.m b/MouseSdk/MouseSdk/Ble/BleManager.m index 06d10ff..6cc640f 100644 --- a/MouseSdk/MouseSdk/Ble/BleManager.m +++ b/MouseSdk/MouseSdk/Ble/BleManager.m @@ -9,7 +9,7 @@ #import "BleManager.h" #import -@interface BleManager () +@interface BleManager () @property (nonatomic,strong) NSMutableArray *scanArray; @property(nonatomic, strong) CBCentralManager *centralManager; @property(nonatomic, strong) CBPeripheral *connectPeripheral;