diff --git a/Podfile b/Podfile index f1d55ce80..656067136 100644 --- a/Podfile +++ b/Podfile @@ -25,13 +25,13 @@ target 'LinkApp' do pod 'TZImagePickerController', '3.2.1' pod 'TrueTime','5.0.3' pod 'KeychainAccess', '4.2.0' - pod 'Tencent-MapSDK', '4.3.9' +# pod 'Tencent-MapSDK', '4.3.9' pod 'lottie-ios', '3.1.8' pod 'CocoaAsyncSocket', '7.6.5' - pod 'TIoTLinkKit_TPNS', '1.0.1' - pod 'TIoTLinkKit_WechatOpenSDK', '1.0.1' +# pod 'TIoTLinkKit_TPNS', '1.0.1' +# pod 'TIoTLinkKit_WechatOpenSDK', '1.0.1' pod 'TIoTLinkKit_IJKPlayer', '2.0.8-beta.202212290234' #~> 2.0.7-beta.202208251730 https://github.com/tencentyun/iot-thirdparty-ios/tree/ijkplayer-v2.0.8-beta.202212280818 - pod 'Bugly', '2.5.91' +# pod 'Bugly', '2.5.91' end diff --git a/Podfile.lock b/Podfile.lock index eaf2e5382..659f79a79 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,5 +1,4 @@ PODS: - - Bugly (2.5.91) - CocoaAsyncSocket (7.6.5) - CocoaLumberjack (3.7.2): - CocoaLumberjack/Core (= 3.7.2) @@ -18,7 +17,6 @@ PODS: - SDWebImage/Core (= 4.4.2) - SDWebImage/Core (4.4.2) - SocketRocket (0.5.1) - - Tencent-MapSDK (4.3.9) - TIoTLinkKit (1.0.0): - TIoTLinkKit/LinkCore (= 1.0.0) - TIoTLinkKit/LinkCore (1.0.0): @@ -27,13 +25,11 @@ PODS: - MBProgressHUD (= 1.1.0) - TIoTLinkKit/LinkRTC (1.0.0): - TIoTLinkKit/LinkCore - - TXLiteAVSDK_TRTC (= 8.0.9644) + - TXLiteAVSDK_TRTC (= 11.5.14702) - YYModel (= 1.0.4) - TIoTLinkKit_FLV (2.2.3) - TIoTLinkKit_IJKPlayer (2.0.8-beta.202212290234) - TIoTLinkKit_SoundTouch (0.0.4) - - TIoTLinkKit_TPNS (1.0.1) - - TIoTLinkKit_WechatOpenSDK (1.0.1) - TIoTLinkKit_XP2P (2.4.27) - TIoTLinkVideo (1.0.0): - CocoaAsyncSocket (= 7.6.5) @@ -41,12 +37,13 @@ PODS: - TIoTLinkKit_SoundTouch (= 0.0.4) - TIoTLinkKit_XP2P (= 2.4.27) - TrueTime (5.0.3) - - TXLiteAVSDK_TRTC (8.0.9644) + - TXLiteAVSDK_TRTC (11.5.14702): + - TXLiteAVSDK_TRTC/TRTC (= 11.5.14702) + - TXLiteAVSDK_TRTC/TRTC (11.5.14702) - TZImagePickerController (3.2.1) - YYModel (1.0.4) DEPENDENCIES: - - Bugly (= 2.5.91) - CocoaAsyncSocket (= 7.6.5) - CocoaLumberjack (= 3.7.2) - FDFullscreenPopGesture (= 1.1) @@ -59,12 +56,9 @@ DEPENDENCIES: - QCloudCOSXML/Transfer (= 5.5.2) - SDWebImage (= 4.4.2) - SocketRocket (= 0.5.1) - - Tencent-MapSDK (= 4.3.9) - TIoTLinkKit (from `./`) - TIoTLinkKit/LinkRTC (from `./`) - TIoTLinkKit_IJKPlayer (= 2.0.8-beta.202212290234) - - TIoTLinkKit_TPNS (= 1.0.1) - - TIoTLinkKit_WechatOpenSDK (= 1.0.1) - TIoTLinkVideo (from `./`) - TrueTime (= 5.0.3) - TZImagePickerController (= 3.2.1) @@ -72,7 +66,6 @@ DEPENDENCIES: SPEC REPOS: https://github.com/CocoaPods/Specs.git: - - Bugly - CocoaAsyncSocket - CocoaLumberjack - FDFullscreenPopGesture @@ -86,12 +79,9 @@ SPEC REPOS: - QCloudCOSXML - SDWebImage - SocketRocket - - Tencent-MapSDK - TIoTLinkKit_FLV - TIoTLinkKit_IJKPlayer - TIoTLinkKit_SoundTouch - - TIoTLinkKit_TPNS - - TIoTLinkKit_WechatOpenSDK - TIoTLinkKit_XP2P - TrueTime - TXLiteAVSDK_TRTC @@ -105,7 +95,6 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - Bugly: afe841bba2ea6de6d432a3c125240a5e75949c55 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0 @@ -119,20 +108,17 @@ SPEC CHECKSUMS: QCloudCOSXML: a30ab17f45b0cbbcbb218a3677298498e8748a22 SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681 SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531 - Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc - TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53 + TIoTLinkKit: 4eb14ec540f1b7e397581870287706c106162b9d TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5 TIoTLinkKit_IJKPlayer: 423fb51f6d04f59a2f2a0ba3c875592f8048735c TIoTLinkKit_SoundTouch: 3b558a8663d8c867305f4336960ca078a9ae9768 - TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968 - TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614 TIoTLinkKit_XP2P: 645a54568e9ecd9915c392a2bd07413a5a79c72f TIoTLinkVideo: 6e1d4d92d2fdb1e6385d3a9ecf222e22aaa1320f TrueTime: b49551ffafb28a9dee04e51b226f42a416010842 - TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d + TXLiteAVSDK_TRTC: 6bc6a7fe128c39f40dd7a6b211e7aa3097090e3c TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30 -PODFILE CHECKSUM: 0dd225e3f9c24b91b41d0868f8e749f6802ed208 +PODFILE CHECKSUM: f985487e002eeca2119b3a2a8db94155ae4792fe -COCOAPODS: 1.9.3 +COCOAPODS: 1.14.3 diff --git a/Source/LinkApp/Classes/Module/Evaluation/View/TIoTEvaluationSharedView.m b/Source/LinkApp/Classes/Module/Evaluation/View/TIoTEvaluationSharedView.m index 3907dfe54..25d4cef2d 100644 --- a/Source/LinkApp/Classes/Module/Evaluation/View/TIoTEvaluationSharedView.m +++ b/Source/LinkApp/Classes/Module/Evaluation/View/TIoTEvaluationSharedView.m @@ -264,10 +264,10 @@ - (void)sharedWeichat { - (void)copyLink { - UIPasteboard *pastboard = [UIPasteboard generalPasteboard]; - pastboard.string = self.webShareURLString; +// UIPasteboard *pastboard = [UIPasteboard generalPasteboard]; +// pastboard.string = self.webShareURLString; - [MBProgressHUD showSuccess:NSLocalizedString(@"evaluation_copyLink_success", @"已复制到剪切板")]; + [MBProgressHUD showSuccess:NSLocalizedString(@"evaluation_copyLink_success", @"请打开注释复制链接")]; [self dismissView]; diff --git a/Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m b/Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m index 8d4659f24..73f352180 100644 --- a/Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m +++ b/Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m @@ -37,7 +37,7 @@ #import "TIoTAlertAuthorsizeView.h" #import #import "TIoTP2PCommunicateUIManage.h" -#import +//#import @import Lottie; @@ -830,7 +830,7 @@ - (void)getFamilyList NSDictionary *data = responseObject[@"Data"]; [[TIoTCoreUserManage shared] saveUserInfo:data]; //上报userID - [Bugly setUserIdentifier:[TIoTCoreUserManage shared].userId]; +// [Bugly setUserIdentifier:[TIoTCoreUserManage shared].userId]; } failure:^(NSString *reason, NSError *error,NSDictionary *dic) { }]; diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.h b/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.h index 4df11cc06..cebe4def5 100644 --- a/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.h +++ b/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.h @@ -3,8 +3,8 @@ #import #import -#import -#import +//#import +//#import @protocol TIoTBaseMapViewControllerDelegate @@ -15,9 +15,9 @@ - (void)enterforegoundAuthorized; @end -@interface TIoTBaseMapViewController : UIViewController +@interface TIoTBaseMapViewController : UIViewController // -@property (nonatomic, strong, readonly) QMapView *mapView; +//@property (nonatomic, strong, readonly) QMapView *mapView; @property (nonatomic, weak) iddelegate; diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m b/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m index eb4818770..fcaf11ccf 100644 --- a/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m +++ b/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m @@ -5,7 +5,7 @@ #import @interface TIoTBaseMapViewController () -@property (nonatomic, strong, readwrite) QMapView *mapView; +//@property (nonatomic, strong, readwrite) QMapView *mapView; @property (nonatomic, strong) CLLocationManager *locationManager; @end @@ -38,24 +38,24 @@ - (void)setupNavigationBar - (void)setupMapView { - self.mapView = [[QMapView alloc] - initWithFrame: CGRectMake(0, - 0, - CGRectGetWidth(self.view.frame), - CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))]; - self.mapView.delegate = self; - - self.mapView.centerCoordinate = CLLocationCoordinate2DMake(39.901268, 116.403854); - self.mapView.zoomLevel = 11; - - // 开启定位 - [self.mapView setShowsUserLocation:YES]; - self.mapView.userTrackingMode = QUserTrackingModeFollow; +// self.mapView = [[QMapView alloc] +// initWithFrame: CGRectMake(0, +// 0, +// CGRectGetWidth(self.view.frame), +// CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))]; +// self.mapView.delegate = self; +// +// self.mapView.centerCoordinate = CLLocationCoordinate2DMake(39.901268, 116.403854); +// self.mapView.zoomLevel = 11; +// +// // 开启定位 +// [self.mapView setShowsUserLocation:YES]; +// self.mapView.userTrackingMode = QUserTrackingModeFollow; // dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ // self.mapView.centerCoordinate = self.mapView.userLocation.location.coordinate; // }); - [self.view addSubview:self.mapView]; +// [self.view addSubview:self.mapView]; } #pragma mark - Life Cycle @@ -74,11 +74,11 @@ - (void)viewDidLoad if (@available(iOS 12.0, *)) { if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) { - self.mapView.mapType = QMapTypeDark; +// self.mapView.mapType = QMapTypeDark; } else { - self.mapView.mapType = QMapTypeStandard; +// self.mapView.mapType = QMapTypeStandard; } } else { // Fallback on earlier versions @@ -97,11 +97,11 @@ - (void)traitCollectionDidChange:(nullable UITraitCollection *)previousTraitColl if (@available(iOS 12.0, *)) { if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) { - self.mapView.mapType = QMapTypeDark; +// self.mapView.mapType = QMapTypeDark; } else { - self.mapView.mapType = QMapTypeStandard; +// self.mapView.mapType = QMapTypeStandard; } } else { // Fallback on earlier versions diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.m b/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.m index 61f9d96c8..db9e3646c 100644 --- a/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.m +++ b/Source/LinkApp/Classes/Module/Map/Controller/TIoTMapVC.m @@ -5,11 +5,12 @@ // #import "TIoTMapVC.h" -#import -#import -#import +//#import +//#import +//#import +//#import +#import #import "TIoTChooseLocationCell.h" -#import #import "TIoTMapLocationModel.h" #import #import "TIoTIntelligentBottomActionView.h" @@ -29,15 +30,15 @@ static CGFloat const kIntervalHeight = 25; //定位按钮距离tableview 距离 static CGFloat const kRightPadding = 0; //定位按钮右边距 -@interface TIoTMapVC () +@interface TIoTMapVC () @property (nonatomic, strong) TIoTIntelligentBottomActionView *bottomActionView; @property (nonatomic, assign) BOOL isLoaded; @property (nonatomic, assign) BOOL isFirstLocatePin; //首次进入定位大头针判断 -@property (nonatomic, strong) QMSSearcher *mapSearcher; - -@property (nonatomic, strong) QPointAnnotation *annotation; -@property (nonatomic, strong) QPinAnnotationView *pinView; -@property (nonatomic, assign) CLLocationCoordinate2D lastLocation; +//@property (nonatomic, strong) QMSSearcher *mapSearcher; +// +//@property (nonatomic, strong) QPointAnnotation *annotation; +//@property (nonatomic, strong) QPinAnnotationView *pinView; +//@property (nonatomic, assign) CLLocationCoordinate2D lastLocation; @property (nonatomic, strong) UIView *searchView; @property (nonatomic, strong) UISearchBar *searchBar; @property (nonatomic, strong) UILabel *searchTipLabel; @@ -62,20 +63,20 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view. - self.mapView.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, kMapVisualMaxHeight); +// self.mapView.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, kMapVisualMaxHeight); [self resetRequestPragma]; - self.mapView.zoomLevel = 15.0; +// self.mapView.zoomLevel = 15.0; [self setupPointAnnotation]; [self setupKeyboardNotification]; [self setupBottomView]; [self setupRefreshView]; - self.mapView.delegate = self; - [self.mapView setUserLocationHidden:NO]; - [self.mapView setShowsUserLocation:YES]; +// self.mapView.delegate = self; +// [self.mapView setUserLocationHidden:NO]; +// [self.mapView setShowsUserLocation:YES]; self.isSearchLocationVCBack = NO; self.searchLocationModel = nil; @@ -112,10 +113,10 @@ - (void)clickMapCenter { } - (void)setupMapCenter { - [self.mapView setCenterCoordinate:self.mapView.userLocation.location.coordinate]; +// [self.mapView setCenterCoordinate:self.mapView.userLocation.location.coordinate]; [self.searchResultArray removeAllObjects]; [self resetRequestPragma]; - [self requestLocationList:self.mapView.userLocation.location.coordinate]; +// [self requestLocationList:self.mapView.userLocation.location.coordinate]; } #pragma mark - overide @@ -130,8 +131,8 @@ - (void)handleTestAction { #pragma mark - Custom method - (void)setupPointAnnotation { - _annotation = [[QPointAnnotation alloc] init]; - [self.mapView addAnnotation:_annotation]; +// _annotation = [[QPointAnnotation alloc] init]; +// [self.mapView addAnnotation:_annotation]; } @@ -145,7 +146,7 @@ - (void)setupHavedLocation { CLLocationCoordinate2D addressLocation = CLLocationCoordinate2DMake(lat,lng); //定位大头针 - [self.mapView setCenterCoordinate:addressLocation]; +// [self.mapView setCenterCoordinate:addressLocation]; //刷新地点列表 [self resetRequestPragma]; @@ -162,7 +163,7 @@ - (void)setupHavedLocation { CLLocationCoordinate2D addressLocation = CLLocationCoordinate2DMake(addressModel.location.lat,addressModel.location.lng); //定位大头针 - [self.mapView setCenterCoordinate:addressLocation]; +// [self.mapView setCenterCoordinate:addressLocation]; //刷新地点列表 [self resetRequestPragma]; @@ -182,12 +183,12 @@ - (void)setupBottomView { self.locationBtn = [UIButton buttonWithType:UIButtonTypeCustom]; [self.locationBtn setImage:[UIImage imageNamed:@"location_choose"] forState:UIControlStateNormal]; [self.locationBtn addTarget:self action:@selector(setupMapCenter) forControlEvents:UIControlEventTouchUpInside]; - [self.mapView addSubview:self.locationBtn]; - [self.locationBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.width.mas_equalTo(kLocationBtnWidthOrHeight); - make.right.equalTo(self.view.mas_right).offset(-kRightPadding); - make.bottom.equalTo(self.mapView.mas_bottom).offset(-kIntervalHeight); - }]; +// [self.mapView addSubview:self.locationBtn]; +// [self.locationBtn mas_makeConstraints:^(MASConstraintMaker *make) { +// make.height.width.mas_equalTo(kLocationBtnWidthOrHeight); +// make.right.equalTo(self.view.mas_right).offset(-kRightPadding); +// make.bottom.equalTo(self.mapView.mas_bottom).offset(-kIntervalHeight); +// }]; // @@ -218,11 +219,11 @@ - (void)setupBottomView { CGFloat kWidthPadding = 16; //searchview [self.view addSubview:self.searchView]; - [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.mapView); - make.height.mas_equalTo(kSearchViewHeight); - make.top.equalTo(self.mapView.mas_bottom).offset(-kSearchTopMap); - }]; +// [self.searchView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.right.equalTo(self.mapView); +// make.height.mas_equalTo(kSearchViewHeight); +// make.top.equalTo(self.mapView.mas_bottom).offset(-kSearchTopMap); +// }]; UIButton *searchLocationBtn = [[UIButton alloc]init]; searchLocationBtn.backgroundColor = [UIColor colorWithHexString:@"#eeeeeF"];//F3F3F5 @@ -291,7 +292,7 @@ - (void)resetRequestPragma { - (void)loadMoreData { - [self requestLocationList:_annotation.coordinate]; +// [self requestLocationList:_annotation.coordinate]; } - (void)searchLocaion { @@ -300,18 +301,18 @@ - (void)searchLocaion { TIoTSearchLocationVC *searchVC = [[TIoTSearchLocationVC alloc]init]; searchVC.chooseLocBlcok = ^(TIoTPoisModel * _Nonnull posiModel) { CLLocationCoordinate2D chooseLocation = CLLocationCoordinate2DMake(posiModel.location.lat,posiModel.location.lng); - weakSelf.annotation.coordinate = chooseLocation; - [weakSelf.mapView setCenterCoordinate:chooseLocation]; +// weakSelf.annotation.coordinate = chooseLocation; +// [weakSelf.mapView setCenterCoordinate:chooseLocation]; weakSelf.isSearchLocationVCBack = YES; weakSelf.searchLocationModel = posiModel; [weakSelf resetRequestPragma]; - [weakSelf requestLocationList:weakSelf.mapView.centerCoordinate]; +// [weakSelf requestLocationList:weakSelf.mapView.centerCoordinate]; }; [self.navigationController pushViewController:searchVC animated:YES]; } - +/* #pragma mark - QMapViewDelegate - (void)mapView:(QMapView *)mapView didUpdateUserLocation:(QUserLocation *)userLocation fromHeading:(BOOL)fromHeading { @@ -398,7 +399,7 @@ - (void)mapView:(QMapView *)mapView regionDidChangeAnimated:(BOOL)animated gestu } _annotation.coordinate = mapView.centerCoordinate; } - + */ #pragma mark - network request - (void)requestLocationList:(CLLocationCoordinate2D )location { @@ -555,7 +556,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath TIoTPoisModel *cellModel = _searchResultArray[indexPath.row]; // 更新位置 - [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(cellModel.location.lat, cellModel.location.lng) animated:YES]; +// [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(cellModel.location.lat, cellModel.location.lng) animated:YES]; [self.searchResultTableView reloadData]; } @@ -571,21 +572,21 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView CGFloat kOrigionY = - (kSearchViewHeight + KScrolledHeight); if (scrollOffSetY <= -kTableViewHeadrHeight) { - self.mapView.center = CGPointMake(kScreenWidth/2, kHeaderViewOrigionY); - - self.mapView.frame = CGRectMake(0, 0, self.mapView.frame.size.width, kTableViewHeadrHeight); +// self.mapView.center = CGPointMake(kScreenWidth/2, kHeaderViewOrigionY); +// +// self.mapView.frame = CGRectMake(0, 0, self.mapView.frame.size.width, kTableViewHeadrHeight); }else if (scrollOffSetY >-kTableViewHeadrHeight && scrollOffSetY < kOrigionY) { // self.mapView.center = CGPointMake(kScreenWidth/2, kHeaderViewOrigionY - (kTableViewHeadrHeight+scrollOffSetY)); - self.mapView.frame = CGRectMake(0, 0, self.mapView.frame.size.width, kTableViewHeadrHeight - (kTableViewHeadrHeight+scrollOffSetY)); +// self.mapView.frame = CGRectMake(0, 0, self.mapView.frame.size.width, kTableViewHeadrHeight - (kTableViewHeadrHeight+scrollOffSetY)); }else if (scrollOffSetY >= kOrigionY) { // self.mapView.center = CGPointMake(kScreenWidth/2, kHeaderViewOrigionY - (kTableViewHeadrHeight+kOrigionY)); - self.mapView.frame = CGRectMake(0, 0, self.mapView.frame.size.width, kTableViewHeadrHeight - (kTableViewHeadrHeight+kOrigionY)); +// self.mapView.frame = CGRectMake(0, 0, self.mapView.frame.size.width, kTableViewHeadrHeight - (kTableViewHeadrHeight+kOrigionY)); } } @@ -618,7 +619,7 @@ - (void)keyboardWillHide:(NSNotification *)notification { weakSelf.searchResultTableView.frame = CGRectMake(0, weakSelf.searchBar.frame.size.height, [UIScreen mainScreen].bounds.size.width, weakSelf.searchView.frame.size.height - weakSelf.searchBar.frame.size.height); }]; } - +/* #pragma mark - QMSSearchDelegate - (void)searchWithReverseGeoCodeSearchOption:(QMSReverseGeoCodeSearchOption *)reverseGeoCodeSearchOption didReceiveResult:(QMSReverseGeoCodeSearchResult *)reverseGeoCodeSearchResult { } @@ -638,7 +639,7 @@ - (QMSSearcher *)mapSearcher { return _mapSearcher; } - +*/ - (NSMutableArray *)searchResultArray { if (!_searchResultArray) { _searchResultArray = [[NSMutableArray alloc]init]; diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTSearchLocationVC.m b/Source/LinkApp/Classes/Module/Map/Controller/TIoTSearchLocationVC.m index fdb5ec07f..10b3e287a 100644 --- a/Source/LinkApp/Classes/Module/Map/Controller/TIoTSearchLocationVC.m +++ b/Source/LinkApp/Classes/Module/Map/Controller/TIoTSearchLocationVC.m @@ -12,7 +12,7 @@ #import "TIoTMapLocationModel.h" #import "TIoTAddressParseModel.h" #import -#import +//#import #import "UIButton+LQRelayout.h" static CGFloat kSearchViewHeight = 64; //searchView 高度 @@ -35,7 +35,7 @@ @interface TIoTSearchLocationVC ()>6); //第二个字节中的前两位00不分片 01、10、11首中尾包 + + if (messageType == 0 || messageType == 1) { //不分包或者首包就正常解析devicename + NSData *contentData = [data subdataWithRange:NSMakeRange(7, data.length-7)]; + NSString *aStr = [[NSString alloc] initWithData:contentData encoding:NSUTF8StringEncoding]; + self.currentDevicename = aStr; + }else if (messageType == 2) { //中包或尾包 就lenght字段后直接跟内容(没有首包的llsyncversion&MTU Filed等) + NSData *contentData = [data subdataWithRange:NSMakeRange(3, data.length-3)]; + NSString *aStr = [[NSString alloc] initWithData:contentData encoding:NSUTF8StringEncoding]; + self.currentDevicename = [self.currentDevicename stringByAppendingString:aStr]; + }else if (messageType == 3) { + NSData *contentData = [data subdataWithRange:NSMakeRange(3, data.length-3)]; + NSString *aStr = [[NSString alloc] initWithData:contentData encoding:NSUTF8StringEncoding]; + self.currentDevicename = [self.currentDevicename stringByAppendingString:aStr]; + } + if (messageType == 0 || messageType == 3){ + [self.blueManager sendLLSyncWithPeripheral:self.currentConnectedPerpheral LLDeviceInfo:@"E101"]; + } }else if ([cmdtype isEqualToString:@"E0"] || [cmdtype isEqualToString:@"e0"]) { //设备WIFI设置模式成功了，此时需要下一步设置wifi pass下发给设备 NSString *wifiname = self.wifiInfo[@"name"]; diff --git a/Source/LinkApp/Classes/Universal/WxManage/WxManager.m b/Source/LinkApp/Classes/Universal/WxManage/WxManager.m index b1a1928be..41a8ad0ad 100755 --- a/Source/LinkApp/Classes/Universal/WxManage/WxManager.m +++ b/Source/LinkApp/Classes/Universal/WxManage/WxManager.m @@ -5,7 +5,7 @@ // #import "WxManager.h" -#import "WXApi.h" +//#import "WXApi.h" #import "TIoTAppEnvironment.h" #import "TIoTAppConfig.h" @@ -13,7 +13,7 @@ //////bundleId com.tencent.cloudiot com.Tenext.TenextCloud -@interface WxManager() +@interface WxManager()// @property (nonatomic,copy)WxBlock authBlk; @property (nonatomic,copy)WxBlock payBlk; @@ -35,24 +35,24 @@ + (instancetype)sharedWxManager + (BOOL)isWXAppInstalled { - return [WXApi isWXAppInstalled]; + return NO;//[WXApi isWXAppInstalled]; } - (void)registerApp { TIoTAppConfigModel *model = [TIoTAppConfig loadLocalConfigList]; - [WXApi registerApp:model.WXAccessAppId universalLink:@"https://iot.cloud.tencent.com/"]; +// [WXApi registerApp:model.WXAccessAppId universalLink:@"https://iot.cloud.tencent.com/"]; } - (BOOL)handleOpenURL:(NSURL *) url { - return [WXApi handleOpenURL:url delegate:self]; + return NO;//[WXApi handleOpenURL:url delegate:self]; } - (BOOL)handleOpenUniversalLink:(NSUserActivity *)userActivity { - return [WXApi handleOpenUniversalLink:userActivity delegate:self]; + return NO;//[WXApi handleOpenUniversalLink:userActivity delegate:self]; } - (void)authFromWxComplete:(WxBlock)blk @@ -61,48 +61,48 @@ - (void)authFromWxComplete:(WxBlock)blk self.authBlk = blk; } - if ([WXApi isWXAppInstalled] && [WXApi isWXAppSupportApi]) { - SendAuthReq *req = [[SendAuthReq alloc] init]; - req.scope = @"snsapi_userinfo"; - req.state = @"app"; - [WXApi sendReq:req completion:^(BOOL success) { - - }]; - }else { - [MBProgressHUD showError:NSLocalizedString(@"uninstalled_LastestWeiChat", @"未安装微信或版本过低")]; - } +// if ([WXApi isWXAppInstalled] && [WXApi isWXAppSupportApi]) { +// SendAuthReq *req = [[SendAuthReq alloc] init]; +// req.scope = @"snsapi_userinfo"; +// req.state = @"app"; +// [WXApi sendReq:req completion:^(BOOL success) { +// +// }]; +// }else { +// [MBProgressHUD showError:NSLocalizedString(@"uninstalled_LastestWeiChat", @"未安装微信或版本过低")]; +// } } -- (void)requestWxInfoWitAuthResp:(BaseResp *)resp -{ - SendAuthResp *aresp = (SendAuthResp *)resp; - if (aresp.errCode != WXSuccess) - { - if (self.authBlk) { - NSError * error = nil; - error = [NSError errorWithDomain:WxManagerError code:aresp.errCode userInfo:@{NSLocalizedDescriptionKey : aresp.errStr?aresp.errStr:[self errorReason:aresp.errCode]}]; - dispatch_async(dispatch_get_main_queue(), ^{ - self.authBlk(nil,error); - }); - [MBProgressHUD showError:[self errorReason:aresp.errCode] toView:nil]; - } - }else { - NSString * code = aresp.code; - if (code.length > 0) { - - if (self.authBlk) { - self.authBlk(code, nil); - } - } - else{ - NSError * error = nil; - error = [NSError errorWithDomain:WxManagerError code:aresp.errCode userInfo:@{NSLocalizedDescriptionKey : aresp.errStr?aresp.errStr:[self errorReason:aresp.errCode]}]; - dispatch_async(dispatch_get_main_queue(), ^{ - self.authBlk(nil,error); - }); - } - } -} +//- (void)requestWxInfoWitAuthResp:(BaseResp *)resp +//{ +// SendAuthResp *aresp = (SendAuthResp *)resp; +// if (aresp.errCode != WXSuccess) +// { +// if (self.authBlk) { +// NSError * error = nil; +// error = [NSError errorWithDomain:WxManagerError code:aresp.errCode userInfo:@{NSLocalizedDescriptionKey : aresp.errStr?aresp.errStr:[self errorReason:aresp.errCode]}]; +// dispatch_async(dispatch_get_main_queue(), ^{ +// self.authBlk(nil,error); +// }); +// [MBProgressHUD showError:[self errorReason:aresp.errCode] toView:nil]; +// } +// }else { +// NSString * code = aresp.code; +// if (code.length > 0) { +// +// if (self.authBlk) { +// self.authBlk(code, nil); +// } +// } +// else{ +// NSError * error = nil; +// error = [NSError errorWithDomain:WxManagerError code:aresp.errCode userInfo:@{NSLocalizedDescriptionKey : aresp.errStr?aresp.errStr:[self errorReason:aresp.errCode]}]; +// dispatch_async(dispatch_get_main_queue(), ^{ +// self.authBlk(nil,error); +// }); +// } +// } +//} - (void)shareWebPageToWXSceneTimelineWithTitle:(NSString *)title @@ -110,23 +110,23 @@ - (void)shareWebPageToWXSceneTimelineWithTitle:(NSString *)title thumbImage:(UIImage*)image webUrl:(NSString *)url // 分享到朋友圈 { - WXMediaMessage * message = [WXMediaMessage message]; - message.title = title?title:@""; - message.description = description?description:@""; - if (image) { - [message setThumbImage:image]; - } - WXWebpageObject * webPage = [WXWebpageObject object]; - webPage.webpageUrl = url; - message.mediaObject = webPage; - - SendMessageToWXReq * req = [[SendMessageToWXReq alloc]init]; - req.bText = NO; - req.message = message; - req.scene = WXSceneTimeline; - [WXApi sendReq:req completion:^(BOOL success) { - - }]; +// WXMediaMessage * message = [WXMediaMessage message]; +// message.title = title?title:@""; +// message.description = description?description:@""; +// if (image) { +// [message setThumbImage:image]; +// } +// WXWebpageObject * webPage = [WXWebpageObject object]; +// webPage.webpageUrl = url; +// message.mediaObject = webPage; +// +// SendMessageToWXReq * req = [[SendMessageToWXReq alloc]init]; +// req.bText = NO; +// req.message = message; +// req.scene = WXSceneTimeline; +// [WXApi sendReq:req completion:^(BOOL success) { +// +// }]; } @@ -135,23 +135,23 @@ - (void)shareWebPageToWXSceneSessionWithTitle:(NSString *)title thumbImage:(UIImage*)image webUrl:(NSString *)url // 分享到聊天界面 { - WXMediaMessage * message = [WXMediaMessage message]; - message.title = title?title:@""; - message.description = description?description:@""; - if (image) { - [message setThumbImage:image]; - } - WXWebpageObject * webPage = [WXWebpageObject object]; - webPage.webpageUrl = url; - message.mediaObject = webPage; - - SendMessageToWXReq * req = [[SendMessageToWXReq alloc]init]; - req.bText = NO; - req.message = message; - req.scene = WXSceneSession; - [WXApi sendReq:req completion:^(BOOL success) { - - }]; +// WXMediaMessage * message = [WXMediaMessage message]; +// message.title = title?title:@""; +// message.description = description?description:@""; +// if (image) { +// [message setThumbImage:image]; +// } +// WXWebpageObject * webPage = [WXWebpageObject object]; +// webPage.webpageUrl = url; +// message.mediaObject = webPage; +// +// SendMessageToWXReq * req = [[SendMessageToWXReq alloc]init]; +// req.bText = NO; +// req.message = message; +// req.scene = WXSceneSession; +// [WXApi sendReq:req completion:^(BOOL success) { +// +// }]; } - (void)shareMiniProgramToWXSceneSessionWithTitle:(NSString *)title @@ -166,56 +166,56 @@ - (void)shareMiniProgramToWXSceneSessionWithTitle:(NSString *)title self.shareBlk = blk; } - WXMiniProgramObject *object = [WXMiniProgramObject object]; - if (webPageUrl.length == 0) { - object.webpageUrl = @""; - } - else{ - object.webpageUrl = webPageUrl; - } - - if (path.length == 0) { - object.path = @"/pages/index/index"; - } - else{ - object.path = path; - } - - if (userName.length == 0) { -// object.userName = [WCAppEnvironment shareEnvironment].microProgramId; - } - else{ - object.userName = userName; - } - -// object.miniProgramType = [TIoTAppEnvironment shareEnvironment].wxShareType;; - - if (image == nil) { - - } - else{ - object.hdImageData = [self compressQualityWithLengthLimit:120*1024 image:image]; - [self shareMiniProgramToWXSceneSessionWithTitle:title description:description miniProgramObject:object]; - } +// WXMiniProgramObject *object = [WXMiniProgramObject object]; +// if (webPageUrl.length == 0) { +// object.webpageUrl = @""; +// } +// else{ +// object.webpageUrl = webPageUrl; +// } +// +// if (path.length == 0) { +// object.path = @"/pages/index/index"; +// } +// else{ +// object.path = path; +// } +// +// if (userName.length == 0) { +//// object.userName = [WCAppEnvironment shareEnvironment].microProgramId; +// } +// else{ +// object.userName = userName; +// } +// +//// object.miniProgramType = [TIoTAppEnvironment shareEnvironment].wxShareType;; +// +// if (image == nil) { +// +// } +// else{ +// object.hdImageData = [self compressQualityWithLengthLimit:120*1024 image:image]; +// [self shareMiniProgramToWXSceneSessionWithTitle:title description:description miniProgramObject:object]; +// } } -- (void)shareMiniProgramToWXSceneSessionWithTitle:(NSString *)title description:(NSString *)description miniProgramObject:(WXMiniProgramObject *)object{ - WXMediaMessage *message = [WXMediaMessage message]; - message.title = title; - message.description = description; - message.thumbData = nil; //兼容旧版本节点的图片，小于32KB，新版本优先 - //使用WXMiniProgramObject的hdImageData属性 - message.mediaObject = object; - - SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init]; - req.bText = NO; - req.message = message; - req.scene = WXSceneSession; //目前只支持会话 - [WXApi sendReq:req completion:^(BOOL success) { - - }]; -} +//- (void)shareMiniProgramToWXSceneSessionWithTitle:(NSString *)title description:(NSString *)description miniProgramObject:(WXMiniProgramObject *)object{ +// WXMediaMessage *message = [WXMediaMessage message]; +// message.title = title; +// message.description = description; +// message.thumbData = nil; //兼容旧版本节点的图片，小于32KB，新版本优先 +// //使用WXMiniProgramObject的hdImageData属性 +// message.mediaObject = object; +// +// SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init]; +// req.bText = NO; +// req.message = message; +// req.scene = WXSceneSession; //目前只支持会话 +// [WXApi sendReq:req completion:^(BOOL success) { +// +// }]; +//} - (NSData *)compressQualityWithLengthLimit:(NSInteger)maxLength image:(UIImage *)image{ NSData *tmpdata = UIImageJPEGRepresentation(image, 1); @@ -241,69 +241,69 @@ - (NSData *)compressQualityWithLengthLimit:(NSInteger)maxLength image:(UIImage * } #pragma mark Delegate --(void) onReq:(BaseReq*)req -{ - DDLogDebug(@"发送"); -} +//-(void) onReq:(BaseReq*)req +//{ +// DDLogDebug(@"发送"); +//} --(void) onResp:(BaseResp*)resp -{ - // 授权 - if ([resp isKindOfClass:[SendAuthResp class]]) //判断是否为授权请求，否则与微信支付等功能发生冲突 - { - [self requestWxInfoWitAuthResp:resp]; - } - - // 分享 - if ([resp isKindOfClass:[SendMessageToWXResp class]]) { // 分享 - SendMessageToWXResp*response=(SendMessageToWXResp*)resp; - if (response.errCode == WXSuccess) { - [MBProgressHUD showSuccess:NSLocalizedString(@"share_success", @"分享成功")]; - if (self.shareBlk) { - dispatch_async(dispatch_get_main_queue(), ^{ - self.shareBlk(nil,nil); - }); - } - }else { - NSError * error = nil; - int errCode = response.errCode; - NSString * errStr = [self errorReason:errCode]; - error = [NSError errorWithDomain:WxManagerError code:errCode userInfo:@{NSLocalizedDescriptionKey : errStr}]; - [MBProgressHUD showError:errStr]; - if (self.shareBlk) { - dispatch_async(dispatch_get_main_queue(), ^{ - self.payBlk(nil,error); - }); - } - } - } -} +//-(void) onResp:(BaseResp*)resp +//{ +// // 授权 +// if ([resp isKindOfClass:[SendAuthResp class]]) //判断是否为授权请求，否则与微信支付等功能发生冲突 +// { +// [self requestWxInfoWitAuthResp:resp]; +// } +// +// // 分享 +// if ([resp isKindOfClass:[SendMessageToWXResp class]]) { // 分享 +// SendMessageToWXResp*response=(SendMessageToWXResp*)resp; +// if (response.errCode == WXSuccess) { +// [MBProgressHUD showSuccess:NSLocalizedString(@"share_success", @"分享成功")]; +// if (self.shareBlk) { +// dispatch_async(dispatch_get_main_queue(), ^{ +// self.shareBlk(nil,nil); +// }); +// } +// }else { +// NSError * error = nil; +// int errCode = response.errCode; +// NSString * errStr = [self errorReason:errCode]; +// error = [NSError errorWithDomain:WxManagerError code:errCode userInfo:@{NSLocalizedDescriptionKey : errStr}]; +// [MBProgressHUD showError:errStr]; +// if (self.shareBlk) { +// dispatch_async(dispatch_get_main_queue(), ^{ +// self.payBlk(nil,error); +// }); +// } +// } +// } +//} - (NSString *)errorReason:(int)code { - int errCode = code; +// int errCode = code; NSString * errStr = @""; - switch (errCode) { - case WXErrCodeCommon: - errStr = NSLocalizedString(@"generalType_error", @"普通错误类型"); - break; - case WXErrCodeUserCancel: - errStr = NSLocalizedString(@"cancel_Weichat_action", @"取消微信操作"); - break; - case WXErrCodeSentFail: - errStr = NSLocalizedString(@"sendFailure", @"发送失败"); - break; - case WXErrCodeAuthDeny: - errStr = NSLocalizedString(@"auth_failed", @"授权失败"); - break; - case WXErrCodeUnsupport: - errStr = NSLocalizedString(@"Weichat_nonsupport", @"微信不支持"); - break; - default: +// switch (errCode) { +// case WXErrCodeCommon: +// errStr = NSLocalizedString(@"generalType_error", @"普通错误类型"); +// break; +// case WXErrCodeUserCancel: +// errStr = NSLocalizedString(@"cancel_Weichat_action", @"取消微信操作"); +// break; +// case WXErrCodeSentFail: +// errStr = NSLocalizedString(@"sendFailure", @"发送失败"); +// break; +// case WXErrCodeAuthDeny: +// errStr = NSLocalizedString(@"auth_failed", @"授权失败"); +// break; +// case WXErrCodeUnsupport: +// errStr = NSLocalizedString(@"Weichat_nonsupport", @"微信不支持"); +// break; +// default: errStr = NSLocalizedString(@"unknown_error", @"未知错误"); - break; - } +// break; +// } return errStr; } diff --git "a/Source/LinkApp/Classes/Universal/\344\277\241\351\270\275\346\216\250\351\200\201/XGPushManage.m" "b/Source/LinkApp/Classes/Universal/\344\277\241\351\270\275\346\216\250\351\200\201/XGPushManage.m" index 451cc4144..b54b8d08c 100644 --- "a/Source/LinkApp/Classes/Universal/\344\277\241\351\270\275\346\216\250\351\200\201/XGPushManage.m" +++ "b/Source/LinkApp/Classes/Universal/\344\277\241\351\270\275\346\216\250\351\200\201/XGPushManage.m" @@ -6,8 +6,8 @@ #import "XGPushManage.h" #import -#import "XGPush.h" -#import "XGPushPrivate.h" /// 如果是海外集群需要导入此头文件 +//#import "XGPush.h" +//#import "XGPushPrivate.h" /// 如果是海外集群需要导入此头文件 #import "TIoTRouter.h" #import "TIoTFeedBackViewController.h" #import "TIoTAppConfig.h" @@ -15,7 +15,7 @@ #import "TIoTTRTCUIManage.h" #import "TIoTP2PCommunicateUIManage.h" -@interface XGPushManage () +@interface XGPushManage ()// @property (nonatomic, copy) NSString *deviceToken; @@ -34,29 +34,29 @@ + (id)sharedXGPushManage{ - (void)startPushService{ -#ifdef DEBUG - [XGPush.defaultManager setEnableDebug:YES]; -#endif - [XGPush.defaultManager stopXGNotification]; +//#ifdef DEBUG +// [XGPush.defaultManager setEnableDebug:YES]; +//#endif +// [XGPush.defaultManager stopXGNotification]; TIoTAppConfigModel *model = [TIoTAppConfig loadLocalConfigList]; NSString *regionID = [TIoTCoreUserManage shared].userRegionId; if ([regionID isEqualToString:@"1"]) { - [XGPush.defaultManager startXGWithAccessID:model.XgAccessId.intValue accessKey:model.XgAccessKey delegate:self]; +// [XGPush.defaultManager startXGWithAccessID:model.XgAccessId.intValue accessKey:model.XgAccessKey delegate:self]; }else { - [XGPush.defaultManager configureClusterDomainName:@"tpns.hk.tencent.com"]; - [XGPush.defaultManager startXGWithAccessID:model.XgUSAAccessId.intValue accessKey:model.XgUSAAccessKey delegate:self]; +// [XGPush.defaultManager configureClusterDomainName:@"tpns.hk.tencent.com"]; +// [XGPush.defaultManager startXGWithAccessID:model.XgUSAAccessId.intValue accessKey:model.XgUSAAccessKey delegate:self]; } - if (XGPush.defaultManager.xgApplicationBadgeNumber > 0) { - [XGPush.defaultManager setXgApplicationBadgeNumber:0]; - } +// if (XGPush.defaultManager.xgApplicationBadgeNumber > 0) { +// [XGPush.defaultManager setXgApplicationBadgeNumber:0]; +// } } - (void)stopPushService{ - [XGPush.defaultManager stopXGNotification]; +// [XGPush.defaultManager stopXGNotification]; [[TIoTRequestObject shared] post:@"AppUnBindXgToken" Param:@{@"Token":self.deviceToken?:@"",@"Platform":@"ios",@"Agent":@"ios"} success:^(id responseObject) { diff --git a/Source/LinkApp/Supporting Files/TIoTAppDelegate.m b/Source/LinkApp/Supporting Files/TIoTAppDelegate.m index 5332bb73d..c3afd7041 100644 --- a/Source/LinkApp/Supporting Files/TIoTAppDelegate.m +++ b/Source/LinkApp/Supporting Files/TIoTAppDelegate.m @@ -21,11 +21,11 @@ #import #import "TIoTScanlViewController.h" #import "TIoTAppUtilOC.h" -#import -#import +//#import +//#import #import "TIoTPrintLogManager.h" #import "TIoTCoreServices.h" -#import +//#import @implementation TIoTAppDelegate @@ -36,7 +36,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( self.isDebug = true; #endif [[TIoTAppEnvironment shareEnvironment] selectEnvironmentType]; - [[TIoTWebSocketManage shared] SRWebSocketOpen]; //注册键盘全局事件 [KeyboardManage registerIQKeyboard]; @@ -49,20 +48,20 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [[WxManager sharedWxManager] registerApp]; TIoTAppConfigModel *model = [TIoTAppConfig loadLocalConfigList]; - [QMapServices sharedServices].APIKey = model.TencentMapSDKValue; - [QMSSearchServices sharedServices].apiKey = model.TencentMapSDKValue; - - //Bugly 统计 - [Bugly startWithAppId:model.BuglySDKAppId]; - BuglyConfig *buglyConfig = [[BuglyConfig alloc]init]; - buglyConfig.blockMonitorEnable = YES; - buglyConfig.blockMonitorTimeout = 2.0; - buglyConfig.unexpectedTerminatingDetectionEnable = YES; - buglyConfig.reportLogLevel = BuglyLogLevelWarn; - [Bugly startWithAppId:model.BuglySDKAppId config:buglyConfig]; +// [QMapServices sharedServices].APIKey = model.TencentMapSDKValue; +// [QMSSearchServices sharedServices].apiKey = model.TencentMapSDKValue; +// +// //Bugly 统计 +// [Bugly startWithAppId:model.BuglySDKAppId]; +// BuglyConfig *buglyConfig = [[BuglyConfig alloc]init]; +// buglyConfig.blockMonitorEnable = YES; +// buglyConfig.blockMonitorTimeout = 2.0; +// buglyConfig.unexpectedTerminatingDetectionEnable = YES; +// buglyConfig.reportLogLevel = BuglyLogLevelWarn; +// [Bugly startWithAppId:model.BuglySDKAppId config:buglyConfig]; //上报userID if ([TIoTCoreUserManage shared].userId != nil) { - [Bugly setUserIdentifier:[TIoTCoreUserManage shared].userId]; +// [Bugly setUserIdentifier:[TIoTCoreUserManage shared].userId]; } //打印日志配置 @@ -86,6 +85,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // TIoTNavigationController *nav = [[TIoTNavigationController alloc] initWithRootViewController:[[TIoTTabBarViewController alloc] init]]; self.window.rootViewController = [[TIoTTabBarViewController alloc] init]; // self.window.rootViewController = nav; + [[TIoTWebSocketManage shared] SRWebSocketOpen]; } else{ diff --git a/Source/SDK/LinkRTC/model/TRTCCalling.h b/Source/SDK/LinkRTC/model/TRTCCalling.h index 940ead7fe..8af80bc53 100644 --- a/Source/SDK/LinkRTC/model/TRTCCalling.h +++ b/Source/SDK/LinkRTC/model/TRTCCalling.h @@ -6,7 +6,8 @@ #import #import "TRTCCallingModel.h" -#import "TRTCCloud.h" +#import +//#import "TRTCCloud.h" #import "TRTCCallingDelegate.h" diff --git a/TIoTLinkKit.podspec b/TIoTLinkKit.podspec index 1c5ac4140..9438d3aee 100644 --- a/TIoTLinkKit.podspec +++ b/TIoTLinkKit.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| #实时音视频，引入则开启 s.subspec 'LinkRTC' do |ss| ss.source_files = 'Source/SDK/LinkRTC/**/*.{h,m,c}' - ss.dependency 'TXLiteAVSDK_TRTC', '8.0.9644' + ss.dependency 'TXLiteAVSDK_TRTC', '11.5.14702' #'8.0.9644' ss.dependency 'YYModel', '1.0.4' ss.dependency 'TIoTLinkKit/LinkCore' ss.pod_target_xcconfig = { diff --git a/TIoTLinkKit.xcodeproj/project.pbxproj b/TIoTLinkKit.xcodeproj/project.pbxproj index cfa4a4530..c6c07197b 100644 --- a/TIoTLinkKit.xcodeproj/project.pbxproj +++ b/TIoTLinkKit.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -3324,7 +3324,6 @@ D2E976AB233C4EDB00182443 /* Embed App Extensions */, F4F3D55424935D75005D3396 /* Embed Frameworks */, 50ABE041C31296DBF30D9DC8 /* [CP] Embed Pods Frameworks */, - 7AFFBDFC4E223BDEB0254F9F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -3558,23 +3557,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LinkApp/Pods-LinkApp-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 7AFFBDFC4E223BDEB0254F9F /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LinkApp/Pods-LinkApp-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-LinkApp/Pods-LinkApp-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LinkApp/Pods-LinkApp-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; FAA5A328888AFA13C2885AD0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -4275,6 +4257,7 @@ CURRENT_PROJECT_VERSION = 6.3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 89W69LHLD3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 89W69LHLD3; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4321,11 +4304,12 @@ "$(PROJECT_DIR)/Source/LinkApp/Classes/Universal/WeChatSDK", "$(PROJECT_DIR)/Source/LinkApp/Classes/Universal/WechatOpenSDK_NoPay", ); - MARKETING_VERSION = 1.0.20; + MARKETING_VERSION = 1.2.20; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.iot.explorer.link.opensource; PRODUCT_MODULE_NAME = LinkApp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = iot_dev_test; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = iot_sdk_app; SWIFT_OBJC_BRIDGING_HEADER = "Source/LinkApp/Supporting Files/LinkApp-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -4347,6 +4331,7 @@ CURRENT_PROJECT_VERSION = 6.3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 89W69LHLD3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 89W69LHLD3; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4393,11 +4378,12 @@ "$(PROJECT_DIR)/Source/LinkApp/Classes/Universal/WeChatSDK", "$(PROJECT_DIR)/Source/LinkApp/Classes/Universal/WechatOpenSDK_NoPay", ); - MARKETING_VERSION = 1.0.20; + MARKETING_VERSION = 1.2.20; PRODUCT_BUNDLE_IDENTIFIER = com.tencent.iot.explorer.link.opensource; PRODUCT_MODULE_NAME = LinkApp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = iot_dev_test; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = iot_sdk_app; SWIFT_OBJC_BRIDGING_HEADER = "Source/LinkApp/Supporting Files/LinkApp-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -4417,6 +4403,7 @@ CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 89W69LHLD3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 89W69LHLD3; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4435,6 +4422,7 @@ PRODUCT_MODULE_NAME = LinkSDKDemo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = iot_sdk_dev_test; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = iot_sdk_demo; SWIFT_OBJC_BRIDGING_HEADER = "Source/LinkSDKDemo/Supporting Files/LinkSDKDemo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -4453,6 +4441,7 @@ CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 89W69LHLD3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 89W69LHLD3; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -4471,6 +4460,7 @@ PRODUCT_MODULE_NAME = LinkSDKDemo; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = iot_sdk_dev_test; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = iot_sdk_demo; SWIFT_OBJC_BRIDGING_HEADER = "Source/LinkSDKDemo/Supporting Files/LinkSDKDemo-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2";