合规整改

Change-Id: Icfd5826e90d6c220b600e2ca816b641fd79b8893
tencentyun · Jan 3, 2024 · 83150f3 · 83150f3
1 parent 0a316f8
commit 83150f3
Show file tree

Hide file tree

Showing 16 changed files with 345 additions and 348 deletions.
diff --git 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
@@ -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,26 +25,25 @@ 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)
     - TIoTLinkKit_FLV (= 2.2.3)
     - 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,20 +56,16 @@ 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)
   - YYModel (= 1.0.4)
 
 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
@@ -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
@@ -37,7 +37,7 @@
 #import "TIoTAlertAuthorsizeView.h"
 #import <AVFoundation/AVFoundation.h>
 #import "TIoTP2PCommunicateUIManage.h"
-#import <Bugly/Bugly.h>
+//#import <Bugly/Bugly.h>
 
 @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
@@ -3,8 +3,8 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import <QMapKit/QMapKit.h>
-#import <QMapKit/QMSSearchKit.h>
+//#import <QMapKit/QMapKit.h>
+//#import <QMapKit/QMSSearchKit.h>
 
 @protocol TIoTBaseMapViewControllerDelegate <NSObject>
 
@@ -15,9 +15,9 @@
 - (void)enterforegoundAuthorized;
 @end
 
-@interface TIoTBaseMapViewController : UIViewController <QMapViewDelegate>
+@interface TIoTBaseMapViewController : UIViewController //<QMapViewDelegate>
 
-@property (nonatomic, strong, readonly) QMapView *mapView;
+//@property (nonatomic, strong, readonly) QMapView *mapView;
 
 @property (nonatomic, weak) id<TIoTBaseMapViewControllerDelegate>delegate;
 

diff --git a/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m b/Source/LinkApp/Classes/Module/Map/Controller/TIoTBaseMapViewController.m
@@ -5,7 +5,7 @@
 #import <CoreLocation/CoreLocation.h>
 
 @interface TIoTBaseMapViewController ()<CLLocationManagerDelegate>
-@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