Skip to content

Commit 83150f3

Browse files
committed
合规整改
Change-Id: Icfd5826e90d6c220b600e2ca816b641fd79b8893
1 parent 0a316f8 commit 83150f3

File tree

16 files changed

+345
-348
lines changed

16 files changed

+345
-348
lines changed

Podfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ target 'LinkApp' do
2525
pod 'TZImagePickerController', '3.2.1'
2626
pod 'TrueTime','5.0.3'
2727
pod 'KeychainAccess', '4.2.0'
28-
pod 'Tencent-MapSDK', '4.3.9'
28+
# pod 'Tencent-MapSDK', '4.3.9'
2929
pod 'lottie-ios', '3.1.8'
3030
pod 'CocoaAsyncSocket', '7.6.5'
31-
pod 'TIoTLinkKit_TPNS', '1.0.1'
32-
pod 'TIoTLinkKit_WechatOpenSDK', '1.0.1'
31+
# pod 'TIoTLinkKit_TPNS', '1.0.1'
32+
# pod 'TIoTLinkKit_WechatOpenSDK', '1.0.1'
3333
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
34-
pod 'Bugly', '2.5.91'
34+
# pod 'Bugly', '2.5.91'
3535
end
3636

3737

Podfile.lock

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
PODS:
2-
- Bugly (2.5.91)
32
- CocoaAsyncSocket (7.6.5)
43
- CocoaLumberjack (3.7.2):
54
- CocoaLumberjack/Core (= 3.7.2)
@@ -18,7 +17,6 @@ PODS:
1817
- SDWebImage/Core (= 4.4.2)
1918
- SDWebImage/Core (4.4.2)
2019
- SocketRocket (0.5.1)
21-
- Tencent-MapSDK (4.3.9)
2220
- TIoTLinkKit (1.0.0):
2321
- TIoTLinkKit/LinkCore (= 1.0.0)
2422
- TIoTLinkKit/LinkCore (1.0.0):
@@ -27,26 +25,25 @@ PODS:
2725
- MBProgressHUD (= 1.1.0)
2826
- TIoTLinkKit/LinkRTC (1.0.0):
2927
- TIoTLinkKit/LinkCore
30-
- TXLiteAVSDK_TRTC (= 8.0.9644)
28+
- TXLiteAVSDK_TRTC (= 11.5.14702)
3129
- YYModel (= 1.0.4)
3230
- TIoTLinkKit_FLV (2.2.3)
3331
- TIoTLinkKit_IJKPlayer (2.0.8-beta.202212290234)
3432
- TIoTLinkKit_SoundTouch (0.0.4)
35-
- TIoTLinkKit_TPNS (1.0.1)
36-
- TIoTLinkKit_WechatOpenSDK (1.0.1)
3733
- TIoTLinkKit_XP2P (2.4.27)
3834
- TIoTLinkVideo (1.0.0):
3935
- CocoaAsyncSocket (= 7.6.5)
4036
- TIoTLinkKit_FLV (= 2.2.3)
4137
- TIoTLinkKit_SoundTouch (= 0.0.4)
4238
- TIoTLinkKit_XP2P (= 2.4.27)
4339
- TrueTime (5.0.3)
44-
- TXLiteAVSDK_TRTC (8.0.9644)
40+
- TXLiteAVSDK_TRTC (11.5.14702):
41+
- TXLiteAVSDK_TRTC/TRTC (= 11.5.14702)
42+
- TXLiteAVSDK_TRTC/TRTC (11.5.14702)
4543
- TZImagePickerController (3.2.1)
4644
- YYModel (1.0.4)
4745

4846
DEPENDENCIES:
49-
- Bugly (= 2.5.91)
5047
- CocoaAsyncSocket (= 7.6.5)
5148
- CocoaLumberjack (= 3.7.2)
5249
- FDFullscreenPopGesture (= 1.1)
@@ -59,20 +56,16 @@ DEPENDENCIES:
5956
- QCloudCOSXML/Transfer (= 5.5.2)
6057
- SDWebImage (= 4.4.2)
6158
- SocketRocket (= 0.5.1)
62-
- Tencent-MapSDK (= 4.3.9)
6359
- TIoTLinkKit (from `./`)
6460
- TIoTLinkKit/LinkRTC (from `./`)
6561
- TIoTLinkKit_IJKPlayer (= 2.0.8-beta.202212290234)
66-
- TIoTLinkKit_TPNS (= 1.0.1)
67-
- TIoTLinkKit_WechatOpenSDK (= 1.0.1)
6862
- TIoTLinkVideo (from `./`)
6963
- TrueTime (= 5.0.3)
7064
- TZImagePickerController (= 3.2.1)
7165
- YYModel (= 1.0.4)
7266

7367
SPEC REPOS:
7468
https://github.com/CocoaPods/Specs.git:
75-
- Bugly
7669
- CocoaAsyncSocket
7770
- CocoaLumberjack
7871
- FDFullscreenPopGesture
@@ -86,12 +79,9 @@ SPEC REPOS:
8679
- QCloudCOSXML
8780
- SDWebImage
8881
- SocketRocket
89-
- Tencent-MapSDK
9082
- TIoTLinkKit_FLV
9183
- TIoTLinkKit_IJKPlayer
9284
- TIoTLinkKit_SoundTouch
93-
- TIoTLinkKit_TPNS
94-
- TIoTLinkKit_WechatOpenSDK
9585
- TIoTLinkKit_XP2P
9686
- TrueTime
9787
- TXLiteAVSDK_TRTC
@@ -105,7 +95,6 @@ EXTERNAL SOURCES:
10595
:path: "./"
10696

10797
SPEC CHECKSUMS:
108-
Bugly: afe841bba2ea6de6d432a3c125240a5e75949c55
10998
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
11099
CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
111100
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
@@ -119,20 +108,17 @@ SPEC CHECKSUMS:
119108
QCloudCOSXML: a30ab17f45b0cbbcbb218a3677298498e8748a22
120109
SDWebImage: 624d6e296c69b244bcede364c72ae0430ac14681
121110
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
122-
Tencent-MapSDK: 6dfbee53b46131deb4c4bb02b3edc5ce7fb630dc
123-
TIoTLinkKit: 0386fb583c61765a02ad5cca810c7661d5a0bc53
111+
TIoTLinkKit: 4eb14ec540f1b7e397581870287706c106162b9d
124112
TIoTLinkKit_FLV: aec2b2ec9664990ec6c5b9f760fc1a9043d5a9a5
125113
TIoTLinkKit_IJKPlayer: 423fb51f6d04f59a2f2a0ba3c875592f8048735c
126114
TIoTLinkKit_SoundTouch: 3b558a8663d8c867305f4336960ca078a9ae9768
127-
TIoTLinkKit_TPNS: 7cea4fc1d20ef6c4c11c4f0b66bbb10ecf4ed968
128-
TIoTLinkKit_WechatOpenSDK: 7822d68cc5c46edf3f6020422202e7b65ea87614
129115
TIoTLinkKit_XP2P: 645a54568e9ecd9915c392a2bd07413a5a79c72f
130116
TIoTLinkVideo: 6e1d4d92d2fdb1e6385d3a9ecf222e22aaa1320f
131117
TrueTime: b49551ffafb28a9dee04e51b226f42a416010842
132-
TXLiteAVSDK_TRTC: e3383a81565e8bb2aaaaab4bd099ad5239cd5b2d
118+
TXLiteAVSDK_TRTC: 6bc6a7fe128c39f40dd7a6b211e7aa3097090e3c
133119
TZImagePickerController: bf4c57b98d8707fce41ea6be872414a71c7a8c9d
134120
YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30
135121

136-
PODFILE CHECKSUM: 0dd225e3f9c24b91b41d0868f8e749f6802ed208
122+
PODFILE CHECKSUM: f985487e002eeca2119b3a2a8db94155ae4792fe
137123

138-
COCOAPODS: 1.9.3
124+
COCOAPODS: 1.14.3

Source/LinkApp/Classes/Module/Evaluation/View/TIoTEvaluationSharedView.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ - (void)sharedWeichat {
264264

265265
- (void)copyLink {
266266

267-
UIPasteboard *pastboard = [UIPasteboard generalPasteboard];
268-
pastboard.string = self.webShareURLString;
267+
// UIPasteboard *pastboard = [UIPasteboard generalPasteboard];
268+
// pastboard.string = self.webShareURLString;
269269

270-
[MBProgressHUD showSuccess:NSLocalizedString(@"evaluation_copyLink_success", @"已复制到剪切板")];
270+
[MBProgressHUD showSuccess:NSLocalizedString(@"evaluation_copyLink_success", @"请打开注释复制链接")];
271271

272272
[self dismissView];
273273

Source/LinkApp/Classes/Module/Home/Controller/TIoTHomeViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#import "TIoTAlertAuthorsizeView.h"
3838
#import <AVFoundation/AVFoundation.h>
3939
#import "TIoTP2PCommunicateUIManage.h"
40-
#import <Bugly/Bugly.h>
40+
//#import <Bugly/Bugly.h>
4141

4242
@import Lottie;
4343

@@ -830,7 +830,7 @@ - (void)getFamilyList
830830
NSDictionary *data = responseObject[@"Data"];
831831
[[TIoTCoreUserManage shared] saveUserInfo:data];
832832
//上报userID
833-
[Bugly setUserIdentifier:[TIoTCoreUserManage shared].userId];
833+
// [Bugly setUserIdentifier:[TIoTCoreUserManage shared].userId];
834834
} failure:^(NSString *reason, NSError *error,NSDictionary *dic) {
835835

836836
}];

Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
#import <Foundation/Foundation.h>
55
#import <UIKit/UIKit.h>
6-
#import <QMapKit/QMapKit.h>
7-
#import <QMapKit/QMSSearchKit.h>
6+
//#import <QMapKit/QMapKit.h>
7+
//#import <QMapKit/QMSSearchKit.h>
88

99
@protocol TIoTBaseMapViewControllerDelegate <NSObject>
1010

@@ -15,9 +15,9 @@
1515
- (void)enterforegoundAuthorized;
1616
@end
1717

18-
@interface TIoTBaseMapViewController : UIViewController <QMapViewDelegate>
18+
@interface TIoTBaseMapViewController : UIViewController //<QMapViewDelegate>
1919

20-
@property (nonatomic, strong, readonly) QMapView *mapView;
20+
//@property (nonatomic, strong, readonly) QMapView *mapView;
2121

2222
@property (nonatomic, weak) id<TIoTBaseMapViewControllerDelegate>delegate;
2323

Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#import <CoreLocation/CoreLocation.h>
66

77
@interface TIoTBaseMapViewController ()<CLLocationManagerDelegate>
8-
@property (nonatomic, strong, readwrite) QMapView *mapView;
8+
//@property (nonatomic, strong, readwrite) QMapView *mapView;
99
@property (nonatomic, strong) CLLocationManager *locationManager;
1010
@end
1111

@@ -38,24 +38,24 @@ - (void)setupNavigationBar
3838

3939
- (void)setupMapView
4040
{
41-
self.mapView = [[QMapView alloc]
42-
initWithFrame: CGRectMake(0,
43-
0,
44-
CGRectGetWidth(self.view.frame),
45-
CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
46-
self.mapView.delegate = self;
47-
48-
self.mapView.centerCoordinate = CLLocationCoordinate2DMake(39.901268, 116.403854);
49-
self.mapView.zoomLevel = 11;
50-
51-
// 开启定位
52-
[self.mapView setShowsUserLocation:YES];
53-
self.mapView.userTrackingMode = QUserTrackingModeFollow;
41+
// self.mapView = [[QMapView alloc]
42+
// initWithFrame: CGRectMake(0,
43+
// 0,
44+
// CGRectGetWidth(self.view.frame),
45+
// CGRectGetHeight(self.view.frame) - CGRectGetMaxY(self.navigationController.navigationBar.frame))];
46+
// self.mapView.delegate = self;
47+
//
48+
// self.mapView.centerCoordinate = CLLocationCoordinate2DMake(39.901268, 116.403854);
49+
// self.mapView.zoomLevel = 11;
50+
//
51+
// // 开启定位
52+
// [self.mapView setShowsUserLocation:YES];
53+
// self.mapView.userTrackingMode = QUserTrackingModeFollow;
5454
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
5555
// self.mapView.centerCoordinate = self.mapView.userLocation.location.coordinate;
5656
// });
5757

58-
[self.view addSubview:self.mapView];
58+
// [self.view addSubview:self.mapView];
5959
}
6060

6161
#pragma mark - Life Cycle
@@ -74,11 +74,11 @@ - (void)viewDidLoad
7474
if (@available(iOS 12.0, *)) {
7575
if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark)
7676
{
77-
self.mapView.mapType = QMapTypeDark;
77+
// self.mapView.mapType = QMapTypeDark;
7878
}
7979
else
8080
{
81-
self.mapView.mapType = QMapTypeStandard;
81+
// self.mapView.mapType = QMapTypeStandard;
8282
}
8383
} else {
8484
// Fallback on earlier versions
@@ -97,11 +97,11 @@ - (void)traitCollectionDidChange:(nullable UITraitCollection *)previousTraitColl
9797
if (@available(iOS 12.0, *)) {
9898
if (self.traitCollection.userInterfaceStyle == UIUserInterfaceStyleDark)
9999
{
100-
self.mapView.mapType = QMapTypeDark;
100+
// self.mapView.mapType = QMapTypeDark;
101101
}
102102
else
103103
{
104-
self.mapView.mapType = QMapTypeStandard;
104+
// self.mapView.mapType = QMapTypeStandard;
105105
}
106106
} else {
107107
// Fallback on earlier versions

0 commit comments

Comments
 (0)