fix import

shshjing · shshjing · commit 6a4f35834b03 · 2019-04-12T15:04:02.000+08:00
diff --git a/Example/VPInterfaceControllerDemo/AppDelegate.m b/Example/VPInterfaceControllerDemo/AppDelegate.m
@@ -7,10 +7,10 @@
 //
 
 #import "AppDelegate.h"
-#import <VideoPlsInterfaceControllerSDK/VPIConfigSDK.h>
+#import <VideoOS-iOS-SDK/VideoPlsInterfaceControllerSDK/VPIConfigSDK.h>
 #import <UMMobClick/MobClick.h>
 #import <Bugly/Bugly.h>
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import <VideoOS-iOS-SDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
 
 @interface AppDelegate ()
 
@@ -28,8 +28,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     version = [version stringByAppendingString:@"_"];
     version = [version stringByAppendingString: [[[NSBundle mainBundle] infoDictionary] objectForKey:(__bridge NSString *) kCFBundleVersionKey]];
     [MobClick setAppVersion:version];
-    [VPIConfigSDK setAppKey:@"e3095ad4-5927-40eb-b6e5-a43b7f1e966b" appSecret:@"b28a1f82e6c147d8"];
-    [[VPUPDebugSwitch sharedDebugSwitch] switchEnvironment:VPUPDebugStateTest];
+    [VPIConfigSDK setAppKey:@"b3423144-3bd7-4b1c-8771-1ca606b600b4" appSecret:@"40f913f5ecbb4225"];
+//    [[VPUPDebugSwitch sharedDebugSwitch] switchEnvironment:VPUPDebugStateTest];
     [VPIConfigSDK initSDK];
     return YES;
 }
diff --git a/Example/VPInterfaceControllerDemo/VPLiveTypeSelectViewController.m b/Example/VPInterfaceControllerDemo/VPLiveTypeSelectViewController.m
@@ -13,7 +13,7 @@
 #import "VPSinglePlayerViewController.h"
 #import "VPTextField.h"
 
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import <VideoOS-iOS-SDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
 
 
 @interface VPLiveSettingView : UIView <UIGestureRecognizerDelegate>
diff --git a/Example/VPInterfaceControllerDemo/VPSinglePlayerViewController.m b/Example/VPInterfaceControllerDemo/VPSinglePlayerViewController.m
@@ -10,12 +10,12 @@
 #import "VPAVPlayerController.h"
 #import "VPMediaControlView.h"
 #import "PrivateConfig.h"
-#import <VideoPlsInterfaceControllerSDK/VPInterfaceController.h>
-#import <VideoPlsInterfaceControllerSDK/VPIUserInfo.h>
-#import <VideoPlsInterfaceControllerSDK/VPIUserLoginInterface.h>
+#import <VideoOS-iOS-SDK/VideoPlsInterfaceControllerSDK/VPInterfaceController.h>
+#import <VideoOS-iOS-SDK/VideoPlsInterfaceControllerSDK/VPIUserInfo.h>
+#import <VideoOS-iOS-SDK/VideoPlsInterfaceControllerSDK/VPIUserLoginInterface.h>
 #import "sys/utsname.h"
 
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import <VideoOS-iOS-SDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
 
 #import <Masonry/Masonry.h>
 #import "VPVideoSettingView.h"
diff --git a/Example/VPInterfaceControllerDemo/ViewController.m b/Example/VPInterfaceControllerDemo/ViewController.m
@@ -10,11 +10,10 @@
 #import <AVKit/AVKit.h>
 #import <AVFoundation/AVFoundation.h>
 #import "VPSinglePlayerViewController.h"
-#import <VideoPlsInterfaceControllerSDK/VPIConfigSDK.h>
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import <VideoOS-iOS-SDK/VideoPlsInterfaceControllerSDK/VPIConfigSDK.h>
+#import <VideoOS-iOS-SDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
 #import "PrivateConfig.h"
 
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
 #import "VPLiveTypeSelectViewController.h"
 #import <AFNetworking/AFNetworking.h>
 
diff --git a/VideoOS-iOS-SDK.podspec b/VideoOS-iOS-SDK.podspec
@@ -36,9 +36,10 @@ Pod::Spec.new do |s|
     spec.public_header_files = "VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/**/*.{h}"
     spec.header_dir = "VideoPlsUtilsPlatformSDK"
     spec.dependency 'AFNetworking'
-    spec.dependency 'SDWebImage'   #SDWebImage建议使用4.2.2，最新版本的SDWebImage会导致相同地址的gif在第二次加载时无法播放
+    spec.dependency 'SDWebImage', '~>4.2.2'   #SDWebImage建议使用4.2.2，最新版本的SDWebImage会导致相同地址的gif在第二次加载时无法播放
     spec.dependency 'SVGAPlayer', '2.1.1'
     spec.dependency 'MQTTClient'
+    spec.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1'}
   end
   s.subspec 'LuaManager' do |spec|
    spec.source_files   = "VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/**/*.{h,m}"
diff --git a/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPIConfigSDK.m b/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPIConfigSDK.m
@@ -25,7 +25,7 @@
 
 #import "VPIConfigSDK.h"
 
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 #import "VPLuaSDK.h"
 
 @implementation VPIConfigSDK
diff --git a/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPIPubWebView.m b/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPIPubWebView.m
@@ -8,7 +8,7 @@
 
 #import "VPIPubWebView.h"
 #import "VPIUserLoginInterface.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 @interface VPIPubWebView()
 
diff --git a/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPIServiceManager.m b/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPIServiceManager.m
@@ -24,7 +24,7 @@
 //
 
 #import "VPIServiceManager.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 @implementation VPIServiceManager
 
diff --git a/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPInterfaceController.m b/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPInterfaceController.m
@@ -26,17 +26,17 @@
 #import "VPInterfaceController.h"
 #import "VPInterfaceClickThroughView.h"
 
-#import <VideoPlsLuaViewManagerSDK/VPLuaOSView.h>
-#import <VideoPlsLuaViewManagerSDK/VPLuaMedia.h>
-#import <VideoPlsLuaViewManagerSDK/VPLuaVideoInfo.h>
-#import <VideoPlsLuaViewManagerSDK/VPLuaPage.h>
-#import <VideoPlsLuaViewManagerSDK/VPLuaNativeBridge.h>
-#import <VideoPlsLuaViewManagerSDK/VPLuaSDK.h>
-
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPInterfaceDataServiceManager.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPRoutes.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPRoutesConstants.h>
+#import "VPLuaOSView.h"
+#import "VPLuaMedia.h"
+#import "VPLuaVideoInfo.h"
+#import "VPLuaPage.h"
+#import "VPLuaNativeBridge.h"
+#import "VPLuaSDK.h"
+
+#import "VideoPlsUtilsPlatformSDK.h"
+#import "VPUPInterfaceDataServiceManager.h"
+#import "VPUPRoutes.h"
+#import "VPUPRoutesConstants.h"
 
 #import "VPInterfaceStatusNotifyDelegate.h"
 #import "VPIUserLoginInterface.h"
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaNativeScanner.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaNativeScanner.m
@@ -7,7 +7,7 @@
 //
 
 #import "VPLuaNativeScanner.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 #import "VPLuaBaseNode.h"
 #import "LVStruct.h"
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaPlayer.h b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaPlayer.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "LVHeads.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 @interface VPLuaPlayer : VPUPVideoClip<LVProtocal, LVClassProtocal>
 
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaSVGAView.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaSVGAView.m
@@ -11,7 +11,7 @@
 #import "LView.h"
 #import "LVStyledString.h"
 #import "LVHeads.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 
 typedef NS_ENUM(NSInteger, VPLuaSVGAViewCallback) {
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaWindow.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaWindow.m
@@ -7,7 +7,7 @@
 //
 
 #import "VPLuaWindow.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 #import "VPLuaBaseNode.h"
 #import "LVStruct.h"
 #import "LuaViewCore.h"
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaMQTT.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaMQTT.m
@@ -9,9 +9,9 @@
 #import "VPLuaMQTT.h"
 #import "LVHeads.h"
 #import "LuaViewCore.h"
-#import <VideoPlsUtilsPlatformSDK/VPUPMQTTHeader.h>
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPMessageTransferStation.h>
+#import "VPUPMQTTHeader.h"
+#import "VideoPlsUtilsPlatformSDK.h"
+#import "VPUPMessageTransferStation.h"
 #import "VPLuaServiceManager.h"
 
 NSString *const VPLuaMQTTClientMessageNotification = @"VPLuaMQTTClientMessageNotification";
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaMedia.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaMedia.m
@@ -11,9 +11,9 @@
 #import "LVStruct.h"
 #import "LuaViewCore.h"
 #import "LVUtil.h"
-#import <VideoPlsUtilsPlatformSDK/VPUPInterfaceDataServiceManager.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPLifeCycle.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPNotificationCenter.h>
+#import "VPUPInterfaceDataServiceManager.h"
+#import "VPUPLifeCycle.h"
+#import "VPUPNotificationCenter.h"
 
 NSString *const VPLuaMediaStartNotification = @"VPLuaMediaStartNotification";
 NSString *const VPLuaMediaPlayNotification = @"VPLuaMediaPlayNotification";
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNativeBridge.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNativeBridge.m
@@ -52,7 +52,7 @@
 #import "sys/utsname.h"
 
 #import "VPLuaVideoPlayerSize.h"
-#import <VideoPlsUtilsPlatformSDK/VPUPInterfaceDataServiceManager.h>
+#import "VPUPInterfaceDataServiceManager.h"
 
 #import "VPLuaMacroDefine.h"
 #import "VPLuaSDK.h"
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNetworkManager.h b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNetworkManager.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPPrefetchHeader.h>
+#import "VPUPPrefetchHeader.h"
 
 @protocol VPUPHTTPAPIManager;
 @protocol VPUPLoadImageManager;
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNetworkManager.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNetworkManager.m
@@ -7,7 +7,7 @@
 //
 
 #import "VPLuaNetworkManager.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 static VPLuaNetworkManager *manager = nil;
 static dispatch_once_t onceToken;
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNodeController.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNodeController.m
@@ -28,7 +28,7 @@
 
 
 #import "LuaViewCore.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 //cont
 //static NSMutableArray<VPLuaNodeController *> *avaliableControllers;
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaServiceManager.h b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaServiceManager.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <VideoPlsUtilsPlatformSDK/VPUPMessageTransferStation.h>
+#import "VPUPMessageTransferStation.h"
 
 @interface VPLuaServiceManager : NSObject
 
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaTrackApi.h b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaTrackApi.h
@@ -6,7 +6,7 @@
 //  Copyright © 2017 videopls. All rights reserved.
 //
 
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 
 @interface VPLuaTrackApi : VPUPHTTPBusinessAPI
 
diff --git a/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/OS/VPLuaOSView.m b/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/OS/VPLuaOSView.m
@@ -7,7 +7,7 @@
 //
 
 #import "VPLuaOSView.h"
-#import <VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.h>
+#import "VideoPlsUtilsPlatformSDK.h"
 #import "VideoPlsLuaViewSDK.h"
 #import "VPLuaServiceManager.h"
 #import "VPUPRSAUtil.h"
