remove all url encode and add method to get video time

Author: shshjing

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/LuaView/VPLuaPlayer.m

@@ -115,7 +115,8 @@ static int source (lua_State *L) {
             NSString *url = lv_paramString(L, 2);// 2
             if( [player isKindOfClass:[VPLuaPlayer class]] ){
                 VPUPVideo *video = [[VPUPVideo alloc] init];
-                video.url = [NSURL URLWithString:[VPUPUrlUtil urlencode:url]];
+//                video.url = [NSURL URLWithString:[VPUPUrlUtil urlencode:url]];
+                video.url = [NSURL URLWithString:url];
                 player.videoArray = @[video];
                 return 0;
             }
@@ -141,7 +142,8 @@ static int videoPlay (lua_State *L) {
                 NSString *url = lv_paramString(L, 2);// 2
                 if( [player isKindOfClass:[VPLuaPlayer class]] ){
                     VPUPVideo *video = [[VPUPVideo alloc] init];
-                    video.url = [NSURL URLWithString:[VPUPUrlUtil urlencode:url]];
+//                    video.url = [NSURL URLWithString:[VPUPUrlUtil urlencode:url]];
+                    video.url = [NSURL URLWithString:url];
                     player.videoArray = @[video];
                 }
             }

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaHttpRequest.m

@@ -156,8 +156,6 @@ static int httpRequest(lua_State *L, VPUPRequestMethodType methodType) {
                     return 0;
                 }
 
-                url = [VPUPUrlUtil urlencode:url];
-                
                 baseUrl = [[NSURL URLWithString:@"/" relativeToURL:[NSURL URLWithString:url]].absoluteString copy];
                 requestMethod = [url stringByReplacingOccurrencesOfString:baseUrl withString:@""];
 
@@ -304,8 +302,6 @@ static int upload(lua_State *L) {
                     filepath = lv_paramString(L, 3);
                 }
 
-                requestUrl = [VPUPUrlUtil urlencode:requestUrl];
-                
                 //重组function的key,保证不重复
                 __block NSString *bRequestMethod = [[VPUPMD5Util md5_16bitHashString:[NSString stringWithFormat:@"%@%@", requestUrl, filepath]] stringByAppendingString:[VPUPRandomUtil randomStringByLength:3]];
                 [LVUtil registryValue:L key:bRequestMethod stack:4];

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaNativeBridge.m

@@ -296,6 +296,8 @@ +(int) lvClassDefine:(lua_State *)L globalName:(NSString*) globalName{
         {"copyStringToPasteBoard", copyStringToPasteBoard},
         {"videoOShost", videoOShost},
         {"isCacheVideo", isCacheVideo},
+        {"currentVideoTime", currentVideoTime},
+        {"videoDuration", videoDuration},
         {NULL, NULL}
     };
     lv_createClassMetaTable(L,META_TABLE_NativeObject);
@@ -654,8 +656,6 @@ static int httpRequest(lua_State *L, VPUPRequestMethodType methodType) {
             return 0;
         }
 
-        url = [VPUPUrlUtil urlencode:url];
-        
         baseUrl = [[NSURL URLWithString:@"/" relativeToURL:[NSURL URLWithString:url]].absoluteString copy];
         requestMethod = [url stringByReplacingOccurrencesOfString:baseUrl withString:@""];
 
@@ -763,8 +763,6 @@ static int upload(lua_State *L) {
             filepath = lv_paramString(L, 3);
         }
 
-        requestUrl = [VPUPUrlUtil urlencode:requestUrl];
-        
         //重组function的key,保证不重复
         __block NSString *bRequestMethod = [[VPUPMD5Util md5_16bitHashString:[NSString stringWithFormat:@"%@%@", requestUrl, filepath]] stringByAppendingString:[VPUPRandomUtil randomStringByLength:3]];
         [LVUtil registryValue:L key:bRequestMethod stack:4];
@@ -1359,7 +1357,8 @@ static int isCacheVideo(lua_State *L) {
         if (lua_type(L, 2) == LUA_TSTRING) {
             NSString *urlString = lv_paramString(L, 2);
 
-            NSURL *url = [NSURL URLWithString:[VPUPUrlUtil urlencode:urlString]];
+//            NSURL *url = [NSURL URLWithString:[VPUPUrlUtil urlencode:urlString]];
+            NSURL *url = [NSURL URLWithString:urlString];
 
             if (url) {
                 NSString *fileName = [NSString stringWithFormat:@"%@.%@",[VPUPMD5Util md5HashString:url.absoluteString],[url pathExtension]];
@@ -1376,4 +1375,16 @@ static int isCacheVideo(lua_State *L) {
     return 1;
 }
 
+static int currentVideoTime(lua_State *L) {
+    NSTimeInterval progress = [VPUPInterfaceDataServiceManager videoPlayerCurrentTime];
+    lua_pushnumber(L, progress);
+    return 1;
+}
+
+static int videoDuration(lua_State *L) {
+    NSTimeInterval progress = [VPUPInterfaceDataServiceManager videoPlayerCurrentItemAssetDuration];
+    lua_pushnumber(L, progress);
+    return 1;
+}
+
 @end

VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/Common/PrefetchManager/VPUPPrefetchVideoManager.m

@@ -30,13 +30,13 @@ - (void)prefetchURLs:(NSArray<NSString *> *)urls {
     NSMutableArray *fileNames = [NSMutableArray arrayWithCapacity:0];
     NSMutableArray *encodeUrls = [NSMutableArray arrayWithCapacity:0];
     for (NSString *urlString in urls) {
-        NSString *urlEncodeString = [VPUPUrlUtil urlencode:urlString];
-        NSURL *url = [NSURL URLWithString:urlEncodeString];
+//        NSString *urlEncodeString = [VPUPUrlUtil urlencode:urlString];
+        NSURL *url = [NSURL URLWithString:urlString];
         if (url) {
             NSString *fileName = [NSString stringWithFormat:@"%@.%@",[VPUPMD5Util md5HashString:url.absoluteString],[url pathExtension]];
             [fileNames addObject:fileName];
         }
-        [encodeUrls addObject:urlEncodeString];
+        [encodeUrls addObject:urlString];
     }
 
     NSString *destinationPath = [VPUPPathUtil pathByPlaceholder:@"videoAds"];