diff --git a/LekangGuard.xcodeproj/project.pbxproj b/LekangGuard.xcodeproj/project.pbxproj index ba600b3..a416bb0 100644 --- a/LekangGuard.xcodeproj/project.pbxproj +++ b/LekangGuard.xcodeproj/project.pbxproj @@ -3973,13 +3973,11 @@ INFOPLIST_KEY_NSCalendarsUsageDescription = "请为APP打开日历权限"; INFOPLIST_KEY_NSCameraUsageDescription = "请为应用打开相机权限,以便使用二维码扫描功能"; INFOPLIST_KEY_NSContactsUsageDescription = "请为应用打开通讯录权限,以便使用联系人批量导入功能"; - INFOPLIST_KEY_NSHealthShareUsageDescription = "APP需要您同意才能访问健康分享"; - INFOPLIST_KEY_NSHealthUpdateUsageDescription = "APP需要您同意才能访问健康分享"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "您是否允许APP访问地理位置"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "请为应用打开定位权限,以便使用地图功能"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "请为应用打开定位权限,以便使用地图功能"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "请为APP打开麦克风权限,以便正常使用聊天功能"; - INFOPLIST_KEY_NSMotionUsageDescription = "该应用程序需要您的同意才能访问运动和健身"; + INFOPLIST_KEY_NSMotionUsageDescription = "App需要您的同意,才能访问运动与健身"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "请为应用打开相册添加权限"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "请为应用打开相册权限"; INFOPLIST_KEY_NSSiriUsageDescription = "请为APP打开Siri权限"; @@ -4063,13 +4061,11 @@ INFOPLIST_KEY_NSCalendarsUsageDescription = "请为APP打开日历权限"; INFOPLIST_KEY_NSCameraUsageDescription = "请为应用打开相机权限,以便使用二维码扫描功能"; INFOPLIST_KEY_NSContactsUsageDescription = "请为应用打开通讯录权限,以便使用联系人批量导入功能"; - INFOPLIST_KEY_NSHealthShareUsageDescription = "APP需要您同意才能访问健康分享"; - INFOPLIST_KEY_NSHealthUpdateUsageDescription = "APP需要您同意才能访问健康分享"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "您是否允许APP访问地理位置"; INFOPLIST_KEY_NSLocationAlwaysUsageDescription = "请为应用打开定位权限,以便使用地图功能"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "请为应用打开定位权限,以便使用地图功能"; INFOPLIST_KEY_NSMicrophoneUsageDescription = "请为APP打开麦克风权限,以便正常使用聊天功能"; - INFOPLIST_KEY_NSMotionUsageDescription = "该应用程序需要您的同意才能访问运动和健身"; + INFOPLIST_KEY_NSMotionUsageDescription = "App需要您的同意,才能访问运动与健身"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "请为应用打开相册添加权限"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "请为应用打开相册权限"; INFOPLIST_KEY_NSSiriUsageDescription = "请为APP打开Siri权限"; diff --git a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate index 5862e1c..f64cf06 100644 Binary files a/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate and b/LekangGuard.xcworkspace/xcuserdata/ecell.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120-1.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120-1.png index 3ac968f..1f8868c 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120-1.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120-1.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120.png index 3ac968f..1f8868c 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/120*120.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/1240*1240.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/1240*1240.png index 0489388..474005d 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/1240*1240.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/1240*1240.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/180*180.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/180*180.png index 5852ab5..78f831e 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/180*180.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/180*180.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/40*40.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/40*40.png index 13a8c95..5778448 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/40*40.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/40*40.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/58*58.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/58*58.png index a41a2cc..4e9ddcb 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/58*58.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/58*58.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/60*60.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/60*60.png index 6075c4e..1886be4 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/60*60.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/60*60.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/80*80.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/80*80.png index af49089..e1d3d3e 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/80*80.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/80*80.png differ diff --git a/LekangGuard/Assets.xcassets/AppIcon.appiconset/87*87.png b/LekangGuard/Assets.xcassets/AppIcon.appiconset/87*87.png index cf372c7..12948a3 100644 Binary files a/LekangGuard/Assets.xcassets/AppIcon.appiconset/87*87.png and b/LekangGuard/Assets.xcassets/AppIcon.appiconset/87*87.png differ diff --git a/LekangGuard/Assets.xcassets/Common/About_logo.imageset/About_logo@2x.png b/LekangGuard/Assets.xcassets/Common/About_logo.imageset/About_logo@2x.png index 5852ab5..78f831e 100644 Binary files a/LekangGuard/Assets.xcassets/Common/About_logo.imageset/About_logo@2x.png and b/LekangGuard/Assets.xcassets/Common/About_logo.imageset/About_logo@2x.png differ diff --git a/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@2x.png b/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@2x.png index af49089..e1d3d3e 100644 Binary files a/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@2x.png and b/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@2x.png differ diff --git a/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@3x.png b/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@3x.png index 3ac968f..1f8868c 100644 Binary files a/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@3x.png and b/LekangGuard/Assets.xcassets/LoginImg/login_logo.imageset/login_logo@3x.png differ diff --git a/LekangGuard/Home/Homes/HomeViewController.m b/LekangGuard/Home/Homes/HomeViewController.m index c41fb9d..d53e5dd 100644 --- a/LekangGuard/Home/Homes/HomeViewController.m +++ b/LekangGuard/Home/Homes/HomeViewController.m @@ -54,7 +54,7 @@ [self zx_setRightBtnWithImg:ImageName_(@"home_icon_add") clickedBlock:^(ZXNavItemBtn * _Nonnull btn) { [self isShowMenu]; }]; - + [self setTotal]; [self QueryMsg]; [self GetDeviceList]; [self GetBannerList]; @@ -116,8 +116,6 @@ [self GetDeviceList]; [self GetBannerList]; } themeColor:KKMainColor refreshStyle:KafkaRefreshStyleReplicatorWoody]; - _homeTable.emptyDataSetSource = self; - _homeTable.emptyDataSetDelegate = self; } return _homeTable; } @@ -167,6 +165,7 @@ /// 获取设备列表 - (void)GetDeviceList { + kWeakSelf(self) self.menuTitles = [NSMutableArray new]; self.menuIcons = [NSMutableArray new]; @@ -188,8 +187,12 @@ [self.menuTitles addObject:model.name]; [self.deviceListArr addObject:model]; } + if (arr.count > 0) { + + weakself.homeTable.emptyDataSetSource = nil; + weakself.homeTable.emptyDataSetDelegate = nil; if (STRINGHASVALUE(APIManager.sharedManager.deviceModel.imei)) { [self.deviceListArr enumerateObjectsUsingBlock:^(DeviceModel *obj, NSUInteger idx, BOOL * _Nonnull stop) { @@ -204,7 +207,11 @@ } } else + { [self GetDeviceMenu:[DeviceModel new]]; + weakself.homeTable.emptyDataSetSource = self; + weakself.homeTable.emptyDataSetDelegate = self; + } self.homeTable.tableHeaderView.height = arr.count == 0 ? Adapted(190) : Adapted(320)+35; self.headerView.isDev = arr.count == 0 ? YES : NO; } error:^(NSError * _Nullable error) { @@ -359,6 +366,24 @@ }]; } +#pragma mark 用户活跃度统计上传 +/// 用户活跃度统计上传 +- (void)setTotal +{ + NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; + NSMutableDictionary *parameters = [NSMutableDictionary dictionary]; + [parameters setValue:@"lekangshouhu" forKey:@"channelName"]; + [parameters setValue:version forKey:@"version"]; + [[[APIManager sharedManager] APGET:Total_URL parameters:parameters resultClass:MyUserMsgModel.class] subscribeNext:^(MyUserMsgModel *model) { + [UICommon HidenLoading]; + + } error:^(NSError * _Nullable error) { + NSDictionary *dic = error.userInfo; + [UICommon MessageErrorText:dic[NSLocalizedDescriptionKey]]; + }]; +} + + - (NSMutableArray *)deviceListArr { diff --git a/LekangGuard/Managers/UIURL.h b/LekangGuard/Managers/UIURL.h index 14c5369..5845efb 100644 --- a/LekangGuard/Managers/UIURL.h +++ b/LekangGuard/Managers/UIURL.h @@ -251,6 +251,9 @@ /// 修改账号信息 #define UpdateInfo_URL @"/user/send/updateInfo" +/// 用户活跃度统计上传 +#define Total_URL @"/version_ratio/active/total" + //用户协议 #define AccoutXieYiURLStr [NSString stringWithFormat:@"http://39.108.227.227/getway/useragreement_tx"] diff --git a/LekangGuard/en.lproj/InfoPlist.strings b/LekangGuard/en.lproj/InfoPlist.strings index 6957527..83a1f61 100644 --- a/LekangGuard/en.lproj/InfoPlist.strings +++ b/LekangGuard/en.lproj/InfoPlist.strings @@ -11,7 +11,7 @@ NSAppleMusicUsageDescription = "Do you allow the App's local concerts to access NSAppleMediaUsageDescription = "Do you allow the App's local music to access your media library for playing music?"; NSMotionUsageDescription = "The app requires your consent to access sports and fitness and display it on your watch, Do you allow it?"; NSCameraUsageDescription = "ECell care needs your permission to use the camera to take pictures as an avatar"; -NSContactsUsageDescription = "App will synchronize the address book to the watch, Do you allow it?"; +NSContactsUsageDescription = "Enable the address book permission for the application so that you can import contacts in batches"; NSLocationUsageDescription = "App needs sync the location information to watch, Do you allow it?"; NSLocationWhenInUseUsageDescription = "ECell care needs your permission to use location to get current weather information"; NSLocationAlwaysUsageDescription = "App needs sync the location information to watch, Do you allow it?"; @@ -20,6 +20,4 @@ NSBluetoothPeripheralUsageDescription = "ECell care needs your consent to use Bl NSBluetoothAlwaysUsageDescription = "ECell care needs your consent to use Bluetooth to connect wearable devices to achieve data transmission functions"; NSMicrophoneUsageDescription = "Please open the microphone permission for APP, so that the chat function can be used normally"; NSSpeechRecognitionUsageDescription = "Whether to allow this app to use speech recognition?"; -NSHealthUpdateUsageDescription = "The APP requires your consent to access HealthShare"; -NSHealthShareUsageDescription = "The APP requires your consent to access HealthShare"; NSLocationAlwaysAndWhenInUseUsageDescription = "Whether you allow the APP to access the location"; diff --git a/LekangGuard/zh-Hans.lproj/InfoPlist.strings b/LekangGuard/zh-Hans.lproj/InfoPlist.strings index a133295..1239f26 100644 --- a/LekangGuard/zh-Hans.lproj/InfoPlist.strings +++ b/LekangGuard/zh-Hans.lproj/InfoPlist.strings @@ -20,5 +20,3 @@ CFBundleDisplayName = "乐康守护"; //NSBluetoothAlwaysUsageDescription = "ECell care needs your consent to use Bluetooth to connect wearable devices to achieve data transmission functions"; //NSMicrophoneUsageDescription = "Please open the microphone permission for APP, so that the chat function can be used normally"; //NSSpeechRecognitionUsageDescription = "Whether to allow this app to use speech recognition?"; -//NSHealthUpdateUsageDescription = "The APP requires your consent to access HealthShare"; -//NSHealthShareUsageDescription = "The APP requires your consent to access HealthShare"; diff --git a/Pods/EasyShowView/EasyShowView/EasyTextBgView.h b/Pods/EasyShowView/EasyShowView/EasyTextBgView.h index 1d578a5..6ac56d6 100644 --- a/Pods/EasyShowView/EasyShowView/EasyTextBgView.h +++ b/Pods/EasyShowView/EasyShowView/EasyTextBgView.h @@ -1,6 +1,5 @@ // // EasyTextBgView.h -// EFHealth // // Created by nf on 16/7/20. // Copyright © 2016年 ef. All rights reserved. diff --git a/Pods/EasyShowView/EasyShowView/EasyTextBgView.m b/Pods/EasyShowView/EasyShowView/EasyTextBgView.m index 7440cc0..1f5e00a 100644 --- a/Pods/EasyShowView/EasyShowView/EasyTextBgView.m +++ b/Pods/EasyShowView/EasyShowView/EasyTextBgView.m @@ -1,6 +1,5 @@ // // EasyTextBgView.m -// EFHealth // // Created by nf on 16/7/20. // Copyright © 2016年 ef. All rights reserved. diff --git a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.h b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.h index 26f96f2..ba2da18 100644 --- a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.h +++ b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.h @@ -31,18 +31,6 @@ typedef void (^JLGeneralAuthorizationCompletion) (void); unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler; /** - 请求健康数据权限统一入口 - - @param typesToShare 共享/写入共享数据类型集合 - @param typesToRead 读入共享数据类型集合 - @param authorizedHandler 授权后的回调 - @param unAuthorizedHandler 未授权的回调 - */ -- (void)JL_requestHealthAuthorizationWithShareTypes:(NSSet*)typesToShare - readTypes:(NSSet*)typesToRead - authorizedHandler:(JLGeneralAuthorizationCompletion)authorizedHandler - unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler; -/** 请求社交账号访问权限 @param authorizationType 权限类型 diff --git a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.m b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.m index 7044e42..4c644e7 100644 --- a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.m +++ b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/AuthorizationManager/JLAuthorizationManager.m @@ -22,111 +22,12 @@ @import CoreLocation; @import MediaPlayer; @import Speech;//Xcode 8.0 or later -@import HealthKit; @import Intents; @import CoreBluetooth; @import Accounts; @import UserNotifications; -@interface JLAuthorizationHealthManager : NSObject -- (void)JL_requestHealthAuthorizationWithShareTypes:(nullable NSSet *)typesToShare - readTypes:(nullable NSSet *)typesToRead - authorizedHandler:(JLGeneralAuthorizationCompletion)authorizedHandler - unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler; -@end - -@implementation JLAuthorizationHealthManager - -- (void)JL_requestHealthAuthorizationWithShareTypes:(nullable NSSet *)typesToShare - readTypes:(nullable NSSet *)typesToRead - authorizedHandler:(JLGeneralAuthorizationCompletion)authorizedHandler - unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler{ - - BOOL isSupportHealthKit = [HKHealthStore isHealthDataAvailable]; - NSAssert(isSupportHealthKit, @"Notice it is not support HealthKit!"); - - HKHealthStore *healthStore = [[HKHealthStore alloc] init]; - __block BOOL shouldRequestAccess = NO; - if (typesToShare.count > 0) { - - [typesToShare enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) { - HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type]; - if (authStatus == HKAuthorizationStatusNotDetermined) { - shouldRequestAccess = YES; - *stop = YES; - } - }]; - - }else{ - if (typesToRead.count > 0) { - - [typesToRead enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) { - HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type]; - if (authStatus == HKAuthorizationStatusNotDetermined) { - shouldRequestAccess = YES; - *stop = YES; - } - }]; - - - }else{ - NSAssert(typesToRead.count > 0, @"待请求的权限类型数组不能为空"); - } - } - - if (shouldRequestAccess) { - [healthStore requestAuthorizationToShareTypes:typesToShare readTypes:typesToRead completion:^(BOOL success, NSError * _Nullable error) { - if (success) { - dispatch_async(dispatch_get_main_queue(), ^{ - authorizedHandler ? authorizedHandler() : nil; - }); - }else{ - dispatch_async(dispatch_get_main_queue(), ^{ - unAuthorizedHandler ? unAuthorizedHandler() : nil; - }); - } - }]; - }else{ - __block BOOL isAuthorized = NO; - if (typesToShare.count > 0) { - [typesToShare enumerateObjectsUsingBlock:^(HKSampleType * _Nonnull type, BOOL * _Nonnull stop) { - HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type]; - if (authStatus == HKAuthorizationStatusNotDetermined - || authStatus == HKAuthorizationStatusSharingDenied) { - isAuthorized = NO; - }else{ - isAuthorized = YES; - } - }]; - }else{ - if (typesToRead.count > 0) { - - [typesToRead enumerateObjectsUsingBlock:^(HKObjectType * _Nonnull type, BOOL * _Nonnull stop) { - HKAuthorizationStatus authStatus = [healthStore authorizationStatusForType:type]; - if (authStatus == HKAuthorizationStatusNotDetermined - || authStatus == HKAuthorizationStatusSharingDenied) { - isAuthorized = NO; - }else{ - isAuthorized = YES; - } - }]; - - }else{ - NSAssert(typesToRead.count > 0, @"待请求的权限类型数组不能为空"); - } - } - - if (isAuthorized) { - authorizedHandler ? authorizedHandler() : nil; - }else{ - unAuthorizedHandler ? unAuthorizedHandler() : nil; - } - - } - -} -@end static NSString *const JLPushNotificationAuthorizationKey = @"JLPushNotificationAuthorizationKey"; static NSString *const JLRequestNotificationsKey = @"JL_requestedNotifications"; @@ -242,19 +143,7 @@ static NSString *const JLRequestNotificationsKey = @"JL_requestedNotifications"; } } -- (void)JL_requestHealthAuthorizationWithShareTypes:(NSSet*)typesToShare - readTypes:(NSSet*)typesToRead - authorizedHandler:(JLGeneralAuthorizationCompletion)authorizedHandler - unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler{ - - JLAuthorizationHealthManager *healthManager = [JLAuthorizationHealthManager new]; - [healthManager JL_requestHealthAuthorizationWithShareTypes:typesToShare - readTypes:typesToRead - authorizedHandler:authorizedHandler - unAuthorizedHandler:unAuthorizedHandler]; - - -} + - (void)JL_requestAccountAuthorizationWithAuthorizationType:(JLAuthorizationType)authorizationType options:(NSDictionary *)options @@ -725,10 +614,7 @@ static NSString *const JLRequestNotificationsKey = @"JL_requestedNotifications"; } } -#pragma mark - Health -- (void)p_requestHealthAccessWithAuthorizedHandler:(JLGeneralAuthorizationCompletion)authorizedHandler - unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler{ -} + #pragma mark - Siri - (void)p_requestSiriAccessWithAuthorizedHandler:(JLGeneralAuthorizationCompletion)authorizedHandler unAuthorizedHandler:(JLGeneralAuthorizationCompletion)unAuthorizedHandler{ diff --git a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLBasePermisssion.m b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLBasePermisssion.m index 8c2d749..2d66895 100644 --- a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLBasePermisssion.m +++ b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLBasePermisssion.m @@ -74,9 +74,6 @@ case JLAuthorizationTypeMotion: return JLAuthorizationInfoPlistKeyMotion; break; - case JLAuthorizationTypeHealth:// only return healthShareType - return JLAuthorizationInfoPlistKeyHealthShare; - break; default: return @" "; diff --git a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLConstant.h b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLConstant.h index 769bd8b..df4b472 100644 --- a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLConstant.h +++ b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Base/JLConstant.h @@ -75,10 +75,6 @@ typedef NS_ENUM(NSInteger, JLAuthorizationType) { */ JLAuthorizationTypePeripheralBluetooth, /** - * 健康数据/Health - */ - JLAuthorizationTypeHealth, - /** * 运动记录/Motion */ JLAuthorizationTypeMotion, @@ -145,7 +141,5 @@ static NSString *const JLAuthorizationInfoPlistKeyLocationAlways = @"NSLoc static NSString *const JLAuthorizationInfoPlistKeyAppleMusic = @"NSAppleMusicUsageDescription"; static NSString *const JLAuthorizationInfoPlistKeySpeechRecognizer = @"NSSpeechRecognitionUsageDescription"; static NSString *const JLAuthorizationInfoPlistKeyMotion = @"NSMotionUsageDescription"; -static NSString *const JLAuthorizationInfoPlistKeyHealthUpdate = @"NSHealthUpdateUsageDescription"; -static NSString *const JLAuthorizationInfoPlistKeyHealthShare = @"NSHealthShareUsageDescription"; #endif /* JLConstant_h */ diff --git a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Permissions/JLHealthPermission.h b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Permissions/JLHealthPermission.h deleted file mode 100644 index 0be196d..0000000 --- a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Permissions/JLHealthPermission.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// JLHealthPermission.h -// JLAuthorizationManager -// -// Created by Jacklin on 2019/1/28. -// - -@import HealthKit; -#import "JLBasePermisssion.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface JLHealthPermission : JLBasePermisssion - -@property (nonatomic, strong) NSSet *shareTypes; -@property (nonatomic, strong) NSSet *readTypes; - -- (instancetype)initWithShareType:(NSSet *)shareTypes - readTypes:(NSSet *)readTypes; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Permissions/JLHealthPermission.m b/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Permissions/JLHealthPermission.m deleted file mode 100644 index d755fe1..0000000 --- a/Pods/JLAuthorizationManager/JLAuthorizationManager/Classes/Permissions/JLHealthPermission.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// JLHealthPermission.m -// JLAuthorizationManager -// -// Created by Jacklin on 2019/1/28. -// - -#import "JLHealthPermission.h" - -@interface JLHealthPermission() - -@property (nonatomic, strong) HKHealthStore *healthStore; - -@end - -@implementation JLHealthPermission - -- (instancetype)initWithShareType:(NSSet *)shareTypes - readTypes:(NSSet *)readTypes { - if (self = [super init]) { - self.shareTypes = shareTypes; - self.readTypes = readTypes; - } - return self; -} - -- (JLAuthorizationType)type { - return JLAuthorizationTypeHealth; -} - -- (JLAuthorizationStatus)authorizationStatus { - - if (![HKHealthStore isHealthDataAvailable]) { - return JLAuthorizationStatusDisabled; - } - - NSMutableArray *statusForHealth = [NSMutableArray new]; - if (self.shareTypes.count > 0) { - for (HKSampleType *oneType in self.shareTypes) { - @autoreleasepool { - HKAuthorizationStatus status = [self.healthStore authorizationStatusForType:oneType]; - [statusForHealth addObject:@(status)]; - } - } - } - - if (self.readTypes.count > 0) { - for (HKObjectType *oneType in self.readTypes) { - @autoreleasepool { - HKAuthorizationStatus status = [self.healthStore authorizationStatusForType:oneType]; - [statusForHealth addObject:@(status)]; - } - } - } - - if (statusForHealth.count > 0) { - if ([statusForHealth containsObject:@(HKAuthorizationStatusNotDetermined)]) { - return JLAuthorizationStatusNotDetermined; - } else if ([statusForHealth containsObject:@(HKAuthorizationStatusSharingDenied)]) { - return JLAuthorizationStatusUnAuthorized; - } else { - return JLAuthorizationStatusAuthorized; - } - } else { - return JLAuthorizationStatusDisabled; - } -} - -- (NSString *)permissionDescriptionKey { - if (self.shareTypes.count > 0) { - return JLAuthorizationInfoPlistKeyHealthShare; - } - return JLAuthorizationInfoPlistKeyHealthUpdate; -} - -- (BOOL)hasSpecificPermissionKeyFromInfoPlist { - return [[NSBundle mainBundle] objectForInfoDictionaryKey:self.permissionDescriptionKey]; -} - -- (void)requestAuthorizationWithCompletion:(JLAuthorizationCompletion)completion { - - NSString *desc = [NSString stringWithFormat:@"%@ not found in Info.plist.", self.permissionDescriptionKey]; - NSAssert([self hasSpecificPermissionKeyFromInfoPlist], desc); - - JLAuthorizationStatus status = [self authorizationStatus]; - if (status == JLAuthorizationStatusNotDetermined) { - - [self.healthStore requestAuthorizationToShareTypes:self.shareTypes readTypes:self.readTypes completion:^(BOOL success, NSError * _Nullable error) { - [self safeAsyncWithCompletion:^{ - if (completion) { - completion(success); - } - }]; - }]; - - } else { - if (completion) { - completion(status == JLAuthorizationStatusAuthorized); - } - } -} - -#pragma mark - Getters -- (HKHealthStore *)healthStore { - if (!_healthStore) { - _healthStore = [[HKHealthStore alloc] init]; - } - return _healthStore; -} - -@end diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 4f90b2e..235d39f 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ dependencies = ( ); name = JuphoonCloudSDK_iOS; + productName = JuphoonCloudSDK_iOS; }; 0C1885900810601510E0C632060FAF26 /* GooglePlaces */ = { isa = PBXAggregateTarget; @@ -24,6 +25,7 @@ dependencies = ( ); name = GooglePlaces; + productName = GooglePlaces; }; 39082CE2CA8065D786A75F5C09CFF2C0 /* AMapFoundation */ = { isa = PBXAggregateTarget; @@ -33,6 +35,7 @@ dependencies = ( ); name = AMapFoundation; + productName = AMapFoundation; }; 54F872FDE6669F86C58C8075211FE643 /* AMapSearch */ = { isa = PBXAggregateTarget; @@ -43,6 +46,7 @@ 296F75B0C5A8A50BDCD83EBECC0C30D1 /* PBXTargetDependency */, ); name = AMapSearch; + productName = AMapSearch; }; 929F50F81D2A5BF3D43E669B99470F02 /* AgoraRtcEngine_Special_iOS */ = { isa = PBXAggregateTarget; @@ -52,6 +56,7 @@ dependencies = ( ); name = AgoraRtcEngine_Special_iOS; + productName = AgoraRtcEngine_Special_iOS; }; E5B4BBC6DD552AC8943C7E22772FC1D3 /* GoogleMaps */ = { isa = PBXAggregateTarget; @@ -61,6 +66,7 @@ dependencies = ( ); name = GoogleMaps; + productName = GoogleMaps; }; F219F05AB3C3ACB1AFF977C96A31685A /* JhtMarquee */ = { isa = PBXAggregateTarget; @@ -70,6 +76,7 @@ dependencies = ( ); name = JhtMarquee; + productName = JhtMarquee; }; /* End PBXAggregateTarget section */ @@ -604,7 +611,6 @@ 9890F04BF5AB464E6397F9982CFABC7F /* SDImageCacheConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 59AE5B27997E20DA745BC1763D0275C9 /* SDImageCacheConfig.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 9A00E2AFB19D533738EE80216459CF32 /* UIImage+ForceDecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 8EE5F01325BDDC12A63E5DC05340336A /* UIImage+ForceDecode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9A699D2B9569F827A68DC20E97FCDF49 /* UIView+ZXNavFrameExtension.m in Sources */ = {isa = PBXBuildFile; fileRef = 4003BC72056F28981D9E5168573729A8 /* UIView+ZXNavFrameExtension.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; - 9A728E89255BB05E087DCCF9AD95D78A /* JLHealthPermission.m in Sources */ = {isa = PBXBuildFile; fileRef = 10BDE2F916C4BC1861C7835792A9931A /* JLHealthPermission.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks -w -Xanalyzer -analyzer-disable-all-checks"; }; }; 9AA88C34AE514E608D5F2090A05362BD /* RACArraySequence.m in Sources */ = {isa = PBXBuildFile; fileRef = F702BF821118690B7226B0D0E7894E77 /* RACArraySequence.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; 9B533C4B6686830B0B30C822777256BD /* SDFileAttributeHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 95D6563E4C452603E8FA9BF35251086F /* SDFileAttributeHelper.h */; settings = {ATTRIBUTES = (Private, ); }; }; 9B5FFDA611EEA9A77D4BB09C2CE8D88A /* MASConstraintMaker.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DDF001CA7759CC2EF27E23F7242F538 /* MASConstraintMaker.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; @@ -678,7 +684,6 @@ B0723B38D683C4B9C188D470AE2996B5 /* LSTTimer-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 191ACB91FEACD8FBCFD66210176EB878 /* LSTTimer-dummy.m */; }; B09D1EC56BDC4728A4D7EF8366D1F342 /* KafkaRingIndicatorFooter.h in Headers */ = {isa = PBXBuildFile; fileRef = 158833604C77ACAFB33A16739920BBC5 /* KafkaRingIndicatorFooter.h */; settings = {ATTRIBUTES = (Public, ); }; }; B10646B6AF73D470221EF25A5DEEEB6F /* ViewController+MASAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A21627A861280027115A9A521187D79 /* ViewController+MASAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B107B2B81B9C63C6945269276872CF47 /* JLHealthPermission.h in Headers */ = {isa = PBXBuildFile; fileRef = 14B7106BDDA5FA12C891C688712D48E6 /* JLHealthPermission.h */; settings = {ATTRIBUTES = (Public, ); }; }; B126DF24E158E9A7D21E77ADB8C9A22B /* EasyTextTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 97C604BB067FAB946AAA2C1B19F43A3D /* EasyTextTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; B151F06CA84C98275DBADAFCE70A719F /* NSUserDefaults+RACSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E2AB9106BE6BC09BD2B7D0D52A9BF67 /* NSUserDefaults+RACSupport.h */; settings = {ATTRIBUTES = (Public, ); }; }; B16617EDB7D91F1084774D94C2D1FA44 /* NSObject+RACKVOWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = F1CD85B05E521E2255C282654A16F3D1 /* NSObject+RACKVOWrapper.m */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; }; @@ -1522,7 +1527,6 @@ 0FC2D8FD53FA74B52116C6630D44D58E /* LSTPopViewManager.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = LSTPopViewManager.h; path = LSTPopView/Classes/Code/LSTPopViewManager.h; sourceTree = ""; }; 1012350826FA7F691021097645B0130F /* LSTPopView.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = LSTPopView.modulemap; sourceTree = ""; }; 103B66CB5CCC5035625E9A6E035E8EED /* UIView+WebCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "UIView+WebCache.m"; path = "SDWebImage/Core/UIView+WebCache.m"; sourceTree = ""; }; - 10BDE2F916C4BC1861C7835792A9931A /* JLHealthPermission.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = JLHealthPermission.m; path = JLAuthorizationManager/Classes/Permissions/JLHealthPermission.m; sourceTree = ""; }; 10D44EC90462CAAE5F18F6CF12005E18 /* AFURLRequestSerialization.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = AFURLRequestSerialization.m; path = AFNetworking/AFURLRequestSerialization.m; sourceTree = ""; }; 10DF3E4CBF08C81914835767402FB618 /* EasyShowLabel.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EasyShowLabel.h; path = EasyShowView/EasyShowLabel.h; sourceTree = ""; }; 115470A72147EB0EA7DA2BBA58BCED49 /* JLCameraPermission.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JLCameraPermission.h; path = JLAuthorizationManager/Classes/Permissions/JLCameraPermission.h; sourceTree = ""; }; @@ -1542,7 +1546,6 @@ 141C17F229D0D107375C7A254AD65A24 /* EasyTextView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = EasyTextView.m; path = EasyShowView/EasyTextView.m; sourceTree = ""; }; 14345B96A715D6DEDE871776E8B68351 /* EasyShowView */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = EasyShowView; path = EasyShowView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 14381930E69DD1E605DBFEDDF7BFCB57 /* SDWebImageOperation.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDWebImageOperation.h; path = SDWebImage/Core/SDWebImageOperation.h; sourceTree = ""; }; - 14B7106BDDA5FA12C891C688712D48E6 /* JLHealthPermission.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = JLHealthPermission.h; path = JLAuthorizationManager/Classes/Permissions/JLHealthPermission.h; sourceTree = ""; }; 152E0C27A68182D325FBF94001BD194F /* whtoast_success.png */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = image.png; name = whtoast_success.png; path = WHToast/wtoast_icon/whtoast_success.png; sourceTree = ""; }; 158833604C77ACAFB33A16739920BBC5 /* KafkaRingIndicatorFooter.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = KafkaRingIndicatorFooter.h; path = KafkaRefresh/UIKit/FootKit/KafkaRingIndicatorFooter.h; sourceTree = ""; }; 15E0F2CE233A0561090618CA503859C9 /* IQKeyboardManager-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "IQKeyboardManager-umbrella.h"; sourceTree = ""; }; @@ -1707,7 +1710,7 @@ 3A90FFAAE41D0947B9D13719B9E44E35 /* SDImageLoadersManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDImageLoadersManager.m; path = SDWebImage/Core/SDImageLoadersManager.m; sourceTree = ""; }; 3AB895BCA7B5A6CD2CB816F95A1C716D /* SDAnimatedImageRep.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDAnimatedImageRep.h; path = SDWebImage/Core/SDAnimatedImageRep.h; sourceTree = ""; }; 3AD12C8F20B6FD9C2A3C3E42BF54C550 /* AFURLRequestSerialization.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFURLRequestSerialization.h; path = AFNetworking/AFURLRequestSerialization.h; sourceTree = ""; }; - 3AF2EAF99208E16F4F075869D1DB32FA /* RACSignalProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; name = RACSignalProvider.d; path = ReactiveObjC/RACSignalProvider.d; sourceTree = ""; }; + 3AF2EAF99208E16F4F075869D1DB32FA /* RACSignalProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.dtrace; name = RACSignalProvider.d; path = ReactiveObjC/RACSignalProvider.d; sourceTree = ""; }; 3B701CF05580B8B52B2B602827DC4442 /* KafkaNativeFooter.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = KafkaNativeFooter.m; path = KafkaRefresh/UIKit/FootKit/KafkaNativeFooter.m; sourceTree = ""; }; 3B79F440DA0000F7C899AD8952C9030E /* ReactiveObjC.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = ReactiveObjC.modulemap; sourceTree = ""; }; 3C147386B2BE657F82ECE2F263207389 /* YYCache-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "YYCache-umbrella.h"; sourceTree = ""; }; @@ -2155,7 +2158,7 @@ 9D2FFA89B200323B208477B151AF4588 /* NSObject+RACKVOWrapper.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+RACKVOWrapper.h"; path = "ReactiveObjC/NSObject+RACKVOWrapper.h"; sourceTree = ""; }; 9D675F11200B5DAD2A26BF7212800250 /* SDImageGraphics.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDImageGraphics.m; path = SDWebImage/Core/SDImageGraphics.m; sourceTree = ""; }; 9D7233E98A2DCE1E96D08ABABB7C47CA /* MQTTClient.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = MQTTClient.h; path = MQTTClient/MQTTClient/MQTTClient.h; sourceTree = ""; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9D9FE33A3F0CA8DBB6A579D7F9E7EFA3 /* SDImageGraphics.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDImageGraphics.h; path = SDWebImage/Core/SDImageGraphics.h; sourceTree = ""; }; 9DBAC8C1CD7885A43F08ECAED7F49BFF /* AMapSearch.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = AMapSearch.release.xcconfig; sourceTree = ""; }; 9DD089A434B7DECD51412C7DC51BE016 /* EasyAlertItem.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = EasyAlertItem.m; path = EasyShowView/EasyAlertItem.m; sourceTree = ""; }; @@ -2348,7 +2351,7 @@ CC9302AFCCAA04EF79B90111C223C2A2 /* IQPreviousNextView.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = IQPreviousNextView.m; path = IQKeyboardManager/IQToolbar/IQPreviousNextView.m; sourceTree = ""; }; CCA9E36B518ECE95E51BA187F3172AF6 /* LTPageTitleItemType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LTPageTitleItemType.swift; path = Example/LTScrollView/Lib/Main/LTTitleView/LTPageTitleItemType.swift; sourceTree = ""; }; CCB1679A411E3416B1D20A092DF44221 /* AFSecurityPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = AFSecurityPolicy.h; path = AFNetworking/AFSecurityPolicy.h; sourceTree = ""; }; - CCF101F3D19CE5A9E66381847B1CAB4D /* RACCompoundDisposableProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; name = RACCompoundDisposableProvider.d; path = ReactiveObjC/RACCompoundDisposableProvider.d; sourceTree = ""; }; + CCF101F3D19CE5A9E66381847B1CAB4D /* RACCompoundDisposableProvider.d */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.dtrace; name = RACCompoundDisposableProvider.d; path = ReactiveObjC/RACCompoundDisposableProvider.d; sourceTree = ""; }; CD021C0D028216D1750B07F586146A55 /* mtc_prof_cfg.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = mtc_prof_cfg.h; path = include/lemon/mtc/mtc_prof_cfg.h; sourceTree = ""; }; CD25033D3CC2993D0FFCCB0C88A9D85F /* LSTTimer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = LSTTimer.debug.xcconfig; sourceTree = ""; }; CD3D68D74DDFF6E46864AE1844BDA443 /* NSArray+RACSequenceAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSArray+RACSequenceAdditions.h"; path = "ReactiveObjC/NSArray+RACSequenceAdditions.h"; sourceTree = ""; }; @@ -2823,7 +2826,6 @@ 3464EB9CAAE2DC38FADF9775E4770738 /* Resources */, 456B3DFEB4E39FB7ABD8D054D111E156 /* Support Files */, ); - name = WHToast; path = WHToast; sourceTree = ""; }; @@ -2931,7 +2933,6 @@ B140137D1C84C201DA36ACB14E24F0C0 /* Resources */, 9A3C64073FFDEB97BD0D2FF53162A775 /* Support Files */, ); - name = ZXNavigationBar; path = ZXNavigationBar; sourceTree = ""; }; @@ -2960,7 +2961,6 @@ 9328D98EBF7C4BA9B14D9FDF2F4777EC /* MSNetwork.m */, 25AA15E0D25559AA131C8282516EFB03 /* Support Files */, ); - name = MSNetwork; path = MSNetwork; sourceTree = ""; }; @@ -3011,7 +3011,6 @@ 63AE5B1FF0AA1560A596878B3D3E12EB /* Resources */, 7E162F849A1CDED8C9054D47A8497471 /* Support Files */, ); - name = SGQRCode; path = SGQRCode; sourceTree = ""; }; @@ -3104,7 +3103,6 @@ 250E76B8F07B70EED26BE8D525CBBE7D /* LTLoopsPlay */, 88363DEF4628454B6183A20395087748 /* Support Files */, ); - name = LTScrollView; path = LTScrollView; sourceTree = ""; }; @@ -3137,7 +3135,6 @@ 5B8D2D2E5B4A604464200A987C075286 /* Support Files */, B6179CCFCB389D50F4FD5F9AFF4D70DA /* UIKit */, ); - name = KafkaRefresh; path = KafkaRefresh; sourceTree = ""; }; @@ -3192,7 +3189,6 @@ 99863AA8773DB1FE37275FAE575BBDA3 /* Resources */, 46EED45EA7CA711D2218EECE1BDDE187 /* Support Files */, ); - name = IQKeyboardManager; path = IQKeyboardManager; sourceTree = ""; }; @@ -3257,7 +3253,6 @@ 19290DB67D61FC4409379A67026D05F8 /* EasyText */, 634C5FC3D599FCAA54CFA8CED7E93CC9 /* Support Files */, ); - name = EasyShowView; path = EasyShowView; sourceTree = ""; }; @@ -3307,7 +3302,6 @@ AE0860AB810B0EF68ACED5B4EE7D5A2D /* Frameworks */, 699F8897CC0D64B65056CBD4D93125E5 /* Support Files */, ); - name = AgoraRtcEngine_Special_iOS; path = AgoraRtcEngine_Special_iOS; sourceTree = ""; }; @@ -3318,7 +3312,6 @@ B71DBAABAF4A89227DE11B487EA26AFB /* Min */, C32723182DA8B48CCC1DC144A55906F7 /* Support Files */, ); - name = MQTTClient; path = MQTTClient; sourceTree = ""; }; @@ -3410,7 +3403,6 @@ FF3F183CB186F2EE0797550E6919190B /* ViewController+MASAdditions.m */, B47643148E7A30AB5E5A4AC6E8B1B92F /* Support Files */, ); - name = Masonry; path = Masonry; sourceTree = ""; }; @@ -3440,7 +3432,6 @@ F6B02691D8B76C355DB0A01999E41022 /* Support Files */, 9FF1716634B0CAD2AC5FA9E42EFC480E /* UIKit */, ); - name = AFNetworking; path = AFNetworking; sourceTree = ""; }; @@ -3469,7 +3460,6 @@ DD7A3CE86BCB818C8751976DBB753796 /* StringPickerView */, 7326AD5BFC82519507532F010DCE8656 /* Support Files */, ); - name = BRPickerView; path = BRPickerView; sourceTree = ""; }; @@ -3513,7 +3503,6 @@ 27142F9A8181E1A5FF7AEDD477682EE9 /* Maps */, 6F19042E75B3F8F199895A243B7AA135 /* Support Files */, ); - name = GoogleMaps; path = GoogleMaps; sourceTree = ""; }; @@ -3549,7 +3538,6 @@ EC76BFBA0B7524B67DB96B976B840288 /* YCShadowView.m */, 57D5025D88BE01DAD211DAD79292F26E /* Support Files */, ); - name = YCShadowView; path = YCShadowView; sourceTree = ""; }; @@ -3566,7 +3554,6 @@ CE9D7418B4064D91A8622100D7E93722 /* YYMemoryCache.m */, 4D9CB93F603AD9235B99290CAFC85EB7 /* Support Files */, ); - name = YYCache; path = YYCache; sourceTree = ""; }; @@ -3825,7 +3812,6 @@ 16DDF96C8774ACD5F18C50416315CB28 /* UITextView+RACSignalSupport.m */, A11F2F67FF783FB20B46D837052F7221 /* Support Files */, ); - name = ReactiveObjC; path = ReactiveObjC; sourceTree = ""; }; @@ -3919,7 +3905,6 @@ 58E3229CEB9E25D547AA1E4313C98357 /* YYModel.h */, 750D8642425120B41C884DB13CE37F8E /* Support Files */, ); - name = YYModel; path = YYModel; sourceTree = ""; }; @@ -3954,7 +3939,6 @@ 106965B1CBF6FE04EF34C9C9F10C7515 /* Resources */, ED0B40EA0ADC202DA5AFACBF61BA15A3 /* Support Files */, ); - name = GooglePlaces; path = GooglePlaces; sourceTree = ""; }; @@ -4003,7 +3987,6 @@ 5695743F2394E752745E26650127A7DA /* UIWindow+LGAlertView.m */, 227B163B0CE1329AD28F8828FCE2C3A0 /* Support Files */, ); - name = LGAlertView; path = LGAlertView; sourceTree = ""; }; @@ -4101,8 +4084,6 @@ 9174E94858D9DDCAF75677385DBAFBC8 /* JLConstant.h */, F76D30285BC0ED373D62FF194AA03200 /* JLContactPermission.h */, AA440D53D1E9EAC349E38EA17A6ED5D9 /* JLContactPermission.m */, - 14B7106BDDA5FA12C891C688712D48E6 /* JLHealthPermission.h */, - 10BDE2F916C4BC1861C7835792A9931A /* JLHealthPermission.m */, B9208A8F3508AEE0BCBF51F8CC7C4C8A /* JLLocationAlwaysPermission.h */, 219D5BCD787D42B51AEF892886C0AD5A /* JLLocationAlwaysPermission.m */, E779993092B106BBC4CF5EBA392F7DFA /* JLLocationInUsePermission.h */, @@ -4124,7 +4105,6 @@ 15A1FDEC2E37A14CDBF4805A1DBE047F /* All */, 827931C9E92528F13796DC317E8574DC /* Support Files */, ); - name = JLAuthorizationManager; path = JLAuthorizationManager; sourceTree = ""; }; @@ -4226,7 +4206,6 @@ 2129F6349A6CD0575CE07D5970565EB7 /* Frameworks */, B8C1A5FE3253FF1F226E1C3F76E8EC47 /* Support Files */, ); - name = JhtMarquee; path = JhtMarquee; sourceTree = ""; }; @@ -4259,7 +4238,6 @@ 13709CC4A14945749091D937E84BDA38 /* Frameworks */, 5B0779248D1358D83A0937B6090B7C97 /* Support Files */, ); - name = AMapSearch; path = AMapSearch; sourceTree = ""; }; @@ -4289,7 +4267,6 @@ 69187472C5DF3771ECBFDD3F9F353837 /* NSString+MJExtension.m */, 7A16C972E057048FAAF940585C95F81F /* Support Files */, ); - name = MJExtension; path = MJExtension; sourceTree = ""; }; @@ -4303,7 +4280,6 @@ 50D19948EB9B6E9B3A7DFA80FE87D403 /* UIColor+LSTColor */, BE4A0EC0D76BFB5DE0C6FA5E6067D88D /* UIView+LSTView */, ); - name = LSTCategory; path = LSTCategory; sourceTree = ""; }; @@ -4393,7 +4369,6 @@ B064484AEFA06616E272BD2CFC918655 /* Core */, A9AB9C3A9222FA5AB156AF6FD5034AC7 /* Support Files */, ); - name = SDWebImage; path = SDWebImage; sourceTree = ""; }; @@ -4705,7 +4680,6 @@ BD9A46C6490179BCC8D8AC46805EDC62 /* Frameworks */, 46C03213894AECCF779C7F2EDE974CA9 /* Support Files */, ); - name = AMapFoundation; path = AMapFoundation; sourceTree = ""; }; @@ -4715,7 +4689,6 @@ CB16C09026B5D78AC54C39761BFDD6E3 /* Code */, 9E012E569E981FB1C51E35903B59824F /* Support Files */, ); - name = LSTPopView; path = LSTPopView; sourceTree = ""; }; @@ -4759,7 +4732,6 @@ 63DFB62BF5F1A297B3258AF02FFFE8F6 /* UIScrollView+EmptyDataSet.m */, A8CEEFC535EE389E5BB0516C4CB44EEF /* Support Files */, ); - name = DZNEmptyDataSet; path = DZNEmptyDataSet; sourceTree = ""; }; @@ -4925,7 +4897,6 @@ E74FFD7AF437031B0FB4DD462B8DA508 /* LSTTimer.m */, 85629900E0EFF5ED272E6E21F7B7C1AF /* Support Files */, ); - name = LSTTimer; path = LSTTimer; sourceTree = ""; }; @@ -4958,7 +4929,6 @@ 116CEF9F7383125E930B3CA50BE662A9 /* include */, 0EB097B0BB2DDDE55D85BF5C427FC9DE /* Support Files */, ); - name = JuphoonCloudSDK_iOS; path = JuphoonCloudSDK_iOS; sourceTree = ""; }; @@ -5592,7 +5562,6 @@ 069AC4D1BA52FCCF96398BD6C458DF6A /* JLCellularNetWorkPermission.h in Headers */, 16756C9AC5287B620A89AC3A77C7A35A /* JLConstant.h in Headers */, 81C136A9A14BA48AA402D29DF1B5D616 /* JLContactPermission.h in Headers */, - B107B2B81B9C63C6945269276872CF47 /* JLHealthPermission.h in Headers */, F19BE404E124B886D50F9453015C9564 /* JLLocationAlwaysPermission.h in Headers */, 543134C76B18D623B21043CD52EDF09D /* JLLocationInUsePermission.h in Headers */, 079414EC98FB2166F75F8EFEF8EDAA49 /* JLMicrophonePermission.h in Headers */, @@ -6496,7 +6465,6 @@ C54099C90B314A97971DB7774471BEA7 /* JLCameraPermission.m in Sources */, 956DAEB3CDB4C43081B31B9EA29D812E /* JLCellularNetWorkPermission.m in Sources */, 8E92029CB7F407A712F43742ABFA1810 /* JLContactPermission.m in Sources */, - 9A728E89255BB05E087DCCF9AD95D78A /* JLHealthPermission.m in Sources */, 19F480D563178718F082E910DF9641D7 /* JLLocationAlwaysPermission.m in Sources */, 6A41FF7D16B63EF1E9482D712424F024 /* JLLocationInUsePermission.m in Sources */, 39F50089B6E2E4365676982105D4ADCE /* JLMicrophonePermission.m in Sources */, diff --git a/Pods/Target Support Files/JLAuthorizationManager/JLAuthorizationManager-umbrella.h b/Pods/Target Support Files/JLAuthorizationManager/JLAuthorizationManager-umbrella.h index 6c00330..2cbca85 100644 --- a/Pods/Target Support Files/JLAuthorizationManager/JLAuthorizationManager-umbrella.h +++ b/Pods/Target Support Files/JLAuthorizationManager/JLAuthorizationManager-umbrella.h @@ -21,7 +21,6 @@ #import "JLCameraPermission.h" #import "JLCellularNetWorkPermission.h" #import "JLContactPermission.h" -#import "JLHealthPermission.h" #import "JLLocationAlwaysPermission.h" #import "JLLocationInUsePermission.h" #import "JLMicrophonePermission.h" @@ -41,7 +40,6 @@ #import "JLCameraPermission.h" #import "JLCellularNetWorkPermission.h" #import "JLContactPermission.h" -#import "JLHealthPermission.h" #import "JLLocationAlwaysPermission.h" #import "JLLocationInUsePermission.h" #import "JLMicrophonePermission.h"