Update code to the latest

Author: shshjing

Example/VPInterfaceControllerDemo/VPAVPlayerController.h

@@ -49,6 +49,7 @@ extern NSString *const VPAVPlayerPlayerbackDidSeekCompleteNotification;
 
 @property (nonatomic, readonly) CGSize videoTrueSize;
 @property (nonatomic, readonly) CGRect videoNowRect;
+@property (nonatomic, assign, readonly) CGRect getVideoFrame;
 
 @property (nonatomic, weak) id<VPVideoPlayerDelegate> videoPlayerDelagate;
 

Example/VPInterfaceControllerDemo/VPAVPlayerController.m

@@ -139,6 +139,12 @@ - (void)dealloc {
     [self shutdown];
 }
 
+//getVideoFrame
+
+- (CGRect)getVideoFrame {
+    return self.view.bounds;
+}
+
 - (void)prepareToPlay {
     if(!_player) {
         return;

Example/VPInterfaceControllerDemo/VPSinglePlayerViewController.m

@@ -178,7 +178,10 @@ - (void)viewDidLoad {
     if ([UIDevice currentDevice].orientation == UIDeviceOrientationPortrait) {
         _mediaControlView.videoSwitchButton.hidden = YES;
         _mediaControlView.btnConstraint.constant = 0;
-        _mediaControlView.videoSwitchButton.selected = NO;
+        VPIServiceConfig *config = [[VPIServiceConfig alloc] init];
+        config.type = VPIServiceTypeVideoMode;
+        config.identifier = _interfaceController.config.identifier;
+        [_interfaceController startService:VPIServiceTypeVideoMode config:config];
     }else {
         _mediaControlView.videoSwitchButton.hidden = NO;
         _mediaControlView.btnConstraint.constant = 60;
@@ -370,7 +373,7 @@ - (void)simulateButtonDidClicked:(id)sender {
     NSString *path =  [[NSBundle mainBundle] pathForResource:@"adInfo" ofType:@"json"];
     NSDictionary *adInfo = [NSJSONSerialization JSONObjectWithData:[[NSData alloc] initWithContentsOfFile:path] options:NSJSONReadingMutableContainers error:nil];
 
-    [_interfaceController navigationWithURL:[NSURL URLWithString:@"LuaView://defaultLuaView?template=os_easy_shop_hotspot.lua&id=5aa5fa5133edbf375fe43fff4"] data:[[adInfo objectForKey:@"launchInfoList"] objectAtIndex:0]];
+    [_interfaceController navigationWithURL:[NSURL URLWithString:@"LuaView://defaultLuaView?template=os_video_figureStarList_hotspot.lua&id=5aa5fa5133edbf375fe43fff4"] data:[[adInfo objectForKey:@"launchInfoList"] objectAtIndex:0]];
 
 //    [_interfaceController navigationWithURL:[NSURL URLWithString:@"LuaView://defaultLuaView?template=os_bubble.lua&id=5aa5fa5133edbf375fe43fff4"] data:[[adInfo objectForKey:@"launchInfoList"] objectAtIndex:0]];
 
@@ -411,6 +414,7 @@ - (void)addSVGAPlayerName:(NSString *)name {
     self.svgPlayer = [[SVGAPlayer alloc]initWithFrame:self.view.bounds];
     self.svgPlayer.delegate = self;
     self.svgPlayer.loops = 1;
+    self.svgPlayer.userInteractionEnabled = NO;
     [self.view addSubview:self.svgPlayer];
     [self.svgPlayer mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.equalTo(self.view);
@@ -593,8 +597,6 @@ - (void)initGestureView {
 
 - (void)initInterfaceController {
 //    [[VPUPDebugSwitch sharedDebugSwitch] switchEnvironment:VPUPDebugStateTest];
-    NSDate *datenow = [NSDate date];
-    [VPIConfigSDK setIdentity:[NSString stringWithFormat:@"%f",[datenow timeIntervalSince1970]]];
     //videoIdentifier可传协商过唯一ID拼接,并非必须为url
     VPInterfaceControllerConfig *config = [[VPInterfaceControllerConfig alloc] init];
     config.platformID = [PrivateConfig shareConfig].platformID;
@@ -880,7 +882,7 @@ - (void)vp_interfaceActionNotify:(NSDictionary *)actionDictionary {
                         [[UIApplication sharedApplication] openURL:[NSURL URLWithString:[actionDictionary objectForKey:@"deepLink"]]];
                     }
                     else {
-                        UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"错误" message:@"DeepLink打开失败" preferredStyle:UIAlertControllerStyleAlert];
+                        UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"错误" message:@"App打开失败" preferredStyle:UIAlertControllerStyleAlert];
                         __weak typeof(self) weakSelf = self;
                         UIAlertAction *action = [UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
                             __strong typeof(self) strongSelf = weakSelf;
@@ -937,6 +939,11 @@ - (NSTimeInterval)videoPlayerCurrentTime {
     return _player.currentPlaybackTime;
 }
 
+
+-(CGRect)videoFrame {
+    return _player.getVideoFrame;
+}
+
 - (VPIVideoPlayerSize *)videoPlayerSize {
     CGSize screenSize = [UIScreen mainScreen].bounds.size;
     VPIVideoPlayerSize *videoPlayerSize = [[VPIVideoPlayerSize alloc] init];

Resources/VideoPlsResources.bundle/lua/main.lua

@@ -352,7 +352,7 @@ local function getTaglist()
             return
         end
         responseData = Native:aesDecrypt(response.encryptData, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY)
-        print("luaview "..responseData)
+        --print("luaview "..responseData)
 
         response = toTable(responseData)
         if (response.resCode ~= "00") then

VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VideoPlsInterfaceControllerSDK/VPInterfaceController.m

@@ -28,6 +28,7 @@
 
 #import "VPLuaOSView.h"
 #import "VPLuaAppletsView.h"
+#import "VPLuaDesktopView.h"
 #import "VPLuaMedia.h"
 #import "VPLuaVideoInfo.h"
 #import "VPLuaPage.h"
@@ -59,6 +60,8 @@ @interface VPInterfaceController()
 
 @property (nonatomic) VPLuaAppletsView *appletsView;
 
+@property (nonatomic) VPLuaDesktopView *desktopView;
+
 @property (nonatomic, readwrite, strong) VPInterfaceControllerConfig *config;
 
 @property (nonatomic, assign) VPIVideoPlayerOrientation orientationType;
@@ -139,6 +142,7 @@ - (void)initViewWithFrame:(CGRect)frame
     _view = [[VPInterfaceClickThroughView alloc] initWithFrame:frame];
     [self initOSViewWithFrame:frame];
     [self initAppletsViewWithFrame:frame];
+    [self initDesktopViewWithFrame:frame];
 }
 
 - (void)initOSViewWithFrame:(CGRect)frame {
@@ -183,13 +187,41 @@ - (void)initAppletsViewWithFrame:(CGRect)frame {
     vpSize.portraitFullScreenWidth = self.videoPlayerSize.portraitFullScreenWidth;
     vpSize.portraitFullScreenHeight = self.videoPlayerSize.portraitFullScreenHeight;
     vpSize.portraitSmallScreenOriginY = self.videoPlayerSize.portraitSmallScreenOriginY;
-    _osView.videoPlayerSize = vpSize;
+    _appletsView.videoPlayerSize = vpSize;
     [_appletsView setGetUserInfoBlock:^NSDictionary *(void) {
         return [weakSelf getUserInfoDictionary];
     }];
     [_view addSubview:_appletsView];
 }
 
+- (void)initDesktopViewWithFrame:(CGRect)frame {
+    
+    __weak typeof(self) weakSelf = self;
+    NSString *platformId = nil;
+    NSString *videoId = nil;
+    
+    platformId = _config.platformID;
+    videoId = _config.identifier;
+    if (_config.types & VPInterfaceControllerTypeVideoOS) {
+        [VPLuaSDK setOSType:VPLuaOSTypeVideoOS];
+    }
+    else {
+        [VPLuaSDK setOSType:VPLuaOSTypeLiveOS];
+    }
+    _desktopView = [[VPLuaDesktopView alloc] initWithFrame:frame platformId:platformId videoId:videoId extendInfo:_config.extendDict];
+    VPLuaVideoPlayerSize *vpSize = [[VPLuaVideoPlayerSize alloc] init];
+    vpSize.portraitSmallScreenHeight = self.videoPlayerSize.portraitSmallScreenHeight;
+    vpSize.portraitFullScreenWidth = self.videoPlayerSize.portraitFullScreenWidth;
+    vpSize.portraitFullScreenHeight = self.videoPlayerSize.portraitFullScreenHeight;
+    vpSize.portraitSmallScreenOriginY = self.videoPlayerSize.portraitSmallScreenOriginY;
+    _desktopView.videoPlayerSize = vpSize;
+    [_desktopView setGetUserInfoBlock:^NSDictionary *(void) {
+        return [weakSelf getUserInfoDictionary];
+    }];
+    [_view addSubview:_desktopView];
+    [_view bringSubviewToFront:_desktopView];
+}
+
 - (BOOL)validateSetAttribute {
     if(!_canSet) {
         //TODO: already start loading, could not set
@@ -229,7 +261,12 @@ - (void)start {
     if (_appletsView) {
         [_appletsView startLoading];
     }
-
+    if (!_desktopView) {
+        [self initDesktopViewWithFrame:self.view.bounds];
+    }
+    if (_desktopView) {
+        [_desktopView startLoading];
+    }
     [self registerStatusNotification];
 }
 
@@ -250,6 +287,9 @@ - (void)notifyVideoScreenChanged:(VPIVideoPlayerOrientation)type {
     if (_appletsView) {
         [_appletsView updateVideoPlayerOrientation:(VPLuaVideoPlayerOrientation)type];
     }
+    if (_desktopView) {
+        [_desktopView updateVideoPlayerOrientation:(VPLuaVideoPlayerOrientation)type];
+    }
 
     CGFloat width = 0;
     CGFloat height = 0;
@@ -314,6 +354,12 @@ - (void)stop {
         _appletsView = nil;
     }
 
+    if (_desktopView) {
+        [_desktopView stop];
+        [_desktopView removeFromSuperview];
+        _desktopView = nil;
+    }
+    
     _canSet = YES;
 }
 
@@ -325,8 +371,8 @@ - (void)pauseVideoAd {
     if (_osView) {
         [_osView pauseVideoAd];
         NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                              @(VPLuaAdActionTypePause), @"ActionType",
-                              @(VPLuaAdEventTypeAction), @"EventType",nil];
+                              @(VPLuaOSActionTypePause), @"osActionType",
+                              @(VPLuaEventTypeOSAction), @"eventType",nil];
         [_osView callLuaMethod:@"event" data:dict];
     }
 }
@@ -335,8 +381,8 @@ - (void)playVideoAd {
     if (_osView) {
         [_osView playVideoAd];
         NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                              @(VPLuaAdActionTypeResume),@"ActionType",
-                              @(VPLuaAdEventTypeAction), @"EventType",nil];
+                              @(VPLuaOSActionTypeResume),@"osActionType",
+                              @(VPLuaEventTypeOSAction), @"eventType",nil];
         [_osView callLuaMethod:@"event" data:dict];
     }
 }
@@ -632,6 +678,10 @@ - (VPUPVideoPlayerSize *)videoPlayerSize {
     return vpupSize;
 }
 
+- (CGRect)videoFrame {
+    return [self.videoPlayerDelegate videoFrame];
+}
+
 - (void)registerRoutes {
     [self registerLuaViewRoutes];
 }
@@ -673,7 +723,7 @@ - (void)registerLuaViewRoutes {
         return YES;
     }];
 
-    //跳转小程序   LuaView://applets?appletId=xxxx&type=x(type: 1横屏,2竖屏)
+    //跳转小程序   LuaView://applets?appletId=xxxx&type=x(type: 1横屏,2竖屏)&appType=x(appType: 1 lua,2 h5)
     //容器内部跳转 LuaView://applets?appletId=xxxx&template=xxxx.lua&id=xxxx&priority=x
     [[VPUPRoutes routesForScheme:VPUPRoutesSDKLuaView] addRoute:@"/applets" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
 
@@ -715,6 +765,37 @@ - (void)registerLuaViewRoutes {
 
         return YES;
     }];
+    
+    [[VPUPRoutes routesForScheme:VPUPRoutesSDKLuaView] addRoute:@"/desktopLuaView" handler:^BOOL(NSDictionary<NSString *,id> * _Nonnull parameters) {
+        
+        if (!weakSelf) {
+            return NO;
+        }
+        __strong typeof(self) strongSelf = weakSelf;
+        //判定osView是否存在，若不存在，先创建
+        if (!strongSelf.desktopView) {
+            [strongSelf initDesktopViewWithFrame:strongSelf.view.bounds];
+            //TODO MQTT,如果_liveView不存在情况怎么处理
+            
+            if(!strongSelf.canSet) {
+                [strongSelf.desktopView startLoading];
+            }
+        }
+        
+        id data = [[parameters objectForKey:VPUPRouteUserInfoKey] objectForKey:@"ActionManagerData"];
+        if (!data) {
+            data = [parameters objectForKey:VPUPRouteUserInfoKey];
+        }
+        
+        NSDictionary *queryParams = [parameters objectForKey:VPUPRouteQueryParamsKey];
+        NSString *luaFile = [queryParams objectForKey:@"template"];
+        if (!luaFile) {
+            luaFile = [data objectForKey:@"template"];
+        }
+        
+        [strongSelf.desktopView loadLua:luaFile data:parameters];
+        return YES;
+    }];
 }
 
 - (void)unregisterRoutes {
@@ -783,6 +864,7 @@ - (void)startService:(VPIServiceType )type config:(VPIServiceConfig *)config {
     serviceConfig.duration = (VPIVideoAdTimeType)config.duration;
 
     self.serviceManager.osView = self.osView;
+    self.serviceManager.desktopView = self.desktopView;
     self.serviceManager.delegate = self;
 
     [self.serviceManager startService:(VPLuaServiceType)type config:serviceConfig];