Skip to content

Commit 5f364f6

Browse files
Zard1096Zard1096
committed
Change commonInfo to Platform
1 parent 7f759a5 commit 5f364f6

File tree

18 files changed

+81
-56
lines changed

18 files changed

+81
-56
lines changed

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@
146146
D0ADC4A622ED83270037A549 /* VPLuaService.h in Headers */ = {isa = PBXBuildFile; fileRef = D0ADC4A422ED83270037A549 /* VPLuaService.h */; };
147147
D0ADC4A722ED83270037A549 /* VPLuaService.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ADC4A522ED83270037A549 /* VPLuaService.m */; };
148148
D0ADC4A822ED83270037A549 /* VPLuaService.m in Sources */ = {isa = PBXBuildFile; fileRef = D0ADC4A522ED83270037A549 /* VPLuaService.m */; };
149-
D0BD1AB221300BA400A087F2 /* VPLuaCommonInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BD1AB021300BA400A087F2 /* VPLuaCommonInfo.h */; };
150-
D0BD1AB321300BA400A087F2 /* VPLuaCommonInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BD1AB121300BA400A087F2 /* VPLuaCommonInfo.m */; };
151-
D0BD1AB421300BA400A087F2 /* VPLuaCommonInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BD1AB121300BA400A087F2 /* VPLuaCommonInfo.m */; };
152149
D0BD1ABF2138DE2100A087F2 /* VPLuaSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BD1ABD2138DE2100A087F2 /* VPLuaSDK.h */; };
153150
D0BD1AC02138DE2100A087F2 /* VPLuaSDK.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BD1ABE2138DE2100A087F2 /* VPLuaSDK.m */; };
154151
D0BD1AC12138DE2100A087F2 /* VPLuaSDK.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BD1ABE2138DE2100A087F2 /* VPLuaSDK.m */; };
@@ -280,8 +277,6 @@
280277
D0ADC4A122ED82B70037A549 /* VPLuaServiceAd.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPLuaServiceAd.m; sourceTree = "<group>"; };
281278
D0ADC4A422ED83270037A549 /* VPLuaService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLuaService.h; sourceTree = "<group>"; };
282279
D0ADC4A522ED83270037A549 /* VPLuaService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLuaService.m; sourceTree = "<group>"; };
283-
D0BD1AB021300BA400A087F2 /* VPLuaCommonInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLuaCommonInfo.h; sourceTree = "<group>"; };
284-
D0BD1AB121300BA400A087F2 /* VPLuaCommonInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLuaCommonInfo.m; sourceTree = "<group>"; };
285280
D0BD1ABD2138DE2100A087F2 /* VPLuaSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLuaSDK.h; sourceTree = "<group>"; };
286281
D0BD1ABE2138DE2100A087F2 /* VPLuaSDK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLuaSDK.m; sourceTree = "<group>"; };
287282
D0C3A1DE206B3E8700C21CA7 /* VPLuaSVGAView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPLuaSVGAView.m; sourceTree = "<group>"; };
@@ -482,8 +477,6 @@
482477
D0114C0F1FCFBFCC00E75EF7 /* VPLuaVideoInfo.h */,
483478
D0114C101FCFBFCC00E75EF7 /* VPLuaVideoInfo.m */,
484479
D0FA556220A13D0000105348 /* VPLuaMacroDefine.h */,
485-
D0BD1AB021300BA400A087F2 /* VPLuaCommonInfo.h */,
486-
D0BD1AB121300BA400A087F2 /* VPLuaCommonInfo.m */,
487480
D0BD1ABD2138DE2100A087F2 /* VPLuaSDK.h */,
488481
D0BD1ABE2138DE2100A087F2 /* VPLuaSDK.m */,
489482
D05D93E922811A1E003FBF3C /* VPLuaHttpRequest.h */,
@@ -589,7 +582,6 @@
589582
0688E24D1FDAA5E4005B9DD2 /* VPLuaRefreshCollectionView.h in Headers */,
590583
063ABC052004C6AC001A8B94 /* VPLuaGradientView.h in Headers */,
591584
06D474AC22F8088900C9DADD /* VPLuaAppletContainerNetworkView.h in Headers */,
592-
D0BD1AB221300BA400A087F2 /* VPLuaCommonInfo.h in Headers */,
593585
D0114C161FCFBFCD00E75EF7 /* VPLuaBaseView.h in Headers */,
594586
D0114C3E1FCFBFCD00E75EF7 /* VPLuaTrackApi.h in Headers */,
595587
D0928C3F207CC135008AB5EC /* VPLuaPage.h in Headers */,
@@ -712,7 +704,6 @@
712704
D0114C291FCFBFCD00E75EF7 /* VPLuaShelvesCardView.m in Sources */,
713705
D0114C231FCFBFCD00E75EF7 /* VPLuaLabel.m in Sources */,
714706
06D474AD22F8088900C9DADD /* VPLuaAppletContainerNetworkView.m in Sources */,
715-
D0BD1AB321300BA400A087F2 /* VPLuaCommonInfo.m in Sources */,
716707
D0114C301FCFBFCD00E75EF7 /* VPLuaWebView.m in Sources */,
717708
D0C3A1E0206B3E8800C21CA7 /* VPLuaSVGAView.m in Sources */,
718709
D05369992051067100A4F8C6 /* VPLuaMQTT.m in Sources */,
@@ -773,7 +764,6 @@
773764
D0114C241FCFBFCD00E75EF7 /* VPLuaLabel.m in Sources */,
774765
D0C3A1E1206B3E8800C21CA7 /* VPLuaSVGAView.m in Sources */,
775766
D053699A2051067100A4F8C6 /* VPLuaMQTT.m in Sources */,
776-
D0BD1AB421300BA400A087F2 /* VPLuaCommonInfo.m in Sources */,
777767
D0114C311FCFBFCD00E75EF7 /* VPLuaWebView.m in Sources */,
778768
D02A1DD822EEA58E00EF5CC2 /* VPLuaServiceVideoMode.m in Sources */,
779769
D00ED8E9202DAB6800B6C8C1 /* VPLuaMedia.m in Sources */,

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Applets/Network/VPLuaAppletRequest.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import "VPUPHTTPBusinessAPI.h"
1212
#import "VPUPHTTPAPIManager.h"
1313
#import "VPLuaSDK.h"
14-
#import "VPLuaCommonInfo.h"
14+
#import "VPUPCommonInfo.h"
1515
#import "VPUPEncryption.h"
1616
#import "VPUPJsonUtil.h"
1717

@@ -50,7 +50,7 @@ - (NSString *)requestWithAppletID:(NSString *)appletID
5050
api.apiRequestMethodType = VPUPRequestMethodTypePOST;
5151
NSMutableDictionary *param = [NSMutableDictionary dictionary];
5252
[param setObject:appletID forKey:@"miniAppId"];
53-
[param setObject:[VPLuaCommonInfo commonParam] forKey:@"commonParam"];
53+
[param setObject:[VPUPCommonInfo commonParam] forKey:@"commonParam"];
5454

5555
NSString *commonParamString = VPUP_DictionaryToJson(param);
5656
api.requestParameters = @{@"data":[VPUPAESUtil aesEncryptString:commonParamString key:[VPLuaSDK sharedSDK].appSecret initVector:[VPLuaSDK sharedSDK].appSecret]};

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaCommonInfo.h‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#import "VPLuaMQTT.h"
3333
#import "VPLuaMedia.h"
3434
#import "VPUPDeviceUtil.h"
35-
#import "VPLuaCommonInfo.h"
35+
#import "VPUPCommonInfo.h"
3636
#import "VPUPSHAUtil.h"
3737
#import "VPLuaLoader.h"
3838

@@ -1298,9 +1298,9 @@ static int rsaDecryptStringWithPublicKey(lua_State *L) {
12981298
}
12991299

13001300
static int commonParam(lua_State *L) {
1301-
// NSString *commonParamString = VPUP_DictionaryToJson([VPLuaCommonInfo commonParam]);
1301+
// NSString *commonParamString = VPUP_DictionaryToJson([VPUPCommonInfo commonParam]);
13021302
// lua_pushstring(L, [commonParamString UTF8String]);
1303-
lv_pushNativeObject(L, [VPLuaCommonInfo commonParam]);
1303+
lv_pushNativeObject(L, [VPUPCommonInfo commonParam]);
13041304
return 1;
13051305
}
13061306

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaSDK.m‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@
1212
#import "VPLuaNetworkManager.h"
1313
#import "VPUPSDKInfo.h"
1414
#import "VPUPGeneralInfo.h"
15-
#import "VPLuaCommonInfo.h"
15+
#import "VPUPCommonInfo.h"
1616
#import <AdSupport/AdSupport.h>
1717

1818
NSString *const VPLuaServerHost = @"https://os-saas.videojj.com/os-api-saas";
1919
NSString *const VPLuaScriptServerUrl = @"https://os-saas.videojj.com/os-api-saas/api/preloadLuaFileInfo";
2020

21+
NSString *const VPLuaRequestPublicKey = @"inekcndsaqwertyi";
22+
2123
@interface VPLuaSDK ()<VPLuaScriptManagerDelegate>
2224

2325
@property (nonatomic, strong) VPLuaScriptManager *luaScriptManager;
@@ -73,6 +75,7 @@ + (void)setAppKey:(NSString *)appKey appSecret:(NSString *)appSecret {
7375
[VPLuaSDK sharedSDK].appSecret = appSecret;
7476
VPUPSDKInfo *sdkinfo = [[VPUPSDKInfo alloc] init];
7577
sdkinfo.mainVPSDKAppKey = appKey;
78+
sdkinfo.mainVPSDKAppSecret = appSecret;
7679
// VPUPSDKInfo *sdkinfo = [VPUPSDKInfo initSDKInfoWithSDKType:VPUPMainSDKTypeVideoOS SDKVersion:[VPLuaSDK sharedSDK].luaVersion appKey:appKey];
7780
[VPUPGeneralInfo setSDKInfo:sdkinfo];
7881
}

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaScriptManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#import "VPUPHTTPAPIManager.h"
1313
#import "VPUPJsonUtil.h"
1414
#import <VPLuaViewSDK/LVZipArchive.h>
15-
#import "VPLuaCommonInfo.h"
15+
#import "VPUPCommonInfo.h"
1616
#import "VPUPRSAUtil.h"
1717
#import "VPUPBase64Util.h"
1818
#import "VPLuaSDK.h"
@@ -70,7 +70,7 @@ - (void)preloadLuaFilesWithUrl:(NSString *)url {
7070
VPUPHTTPBusinessAPI *api = [[VPUPHTTPBusinessAPI alloc] init];
7171
api.baseUrl = url;
7272
api.apiRequestMethodType = VPUPRequestMethodTypePOST;
73-
NSString *commonParamString = VPUP_DictionaryToJson(@{@"commonParam":[VPLuaCommonInfo commonParam]});
73+
NSString *commonParamString = VPUP_DictionaryToJson(@{@"commonParam":[VPUPCommonInfo commonParam]});
7474
api.requestParameters = @{@"data":[VPUPAESUtil aesEncryptString:commonParamString key:[VPLuaSDK sharedSDK].appSecret initVector:[VPLuaSDK sharedSDK].appSecret]};
7575
api.apiCompletionHandler = ^(id _Nonnull responseObject, NSError * _Nullable error, NSURLResponse * _Nullable response) {
7676

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaServiceAd.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "VPLuaServiceAd.h"
10-
#import "VPLuaCommonInfo.h"
10+
#import "VPUPCommonInfo.h"
1111
#import "VPUPHTTPBusinessAPI.h"
1212
#import "VPUPHTTPAPIManager.h"
1313
#import "VPUPHTTPManagerFactory.h"
@@ -65,7 +65,7 @@ - (void)requestServiceAd {
6565
api.apiRequestMethodType = VPUPRequestMethodTypePOST;
6666

6767
NSMutableDictionary *param = [NSMutableDictionary dictionaryWithCapacity:0];
68-
[param setObject:[VPLuaCommonInfo commonParam] forKey:@"commonParam"];
68+
[param setObject:[VPUPCommonInfo commonParam] forKey:@"commonParam"];
6969
[param setObject:self.config.identifier forKey:@"videoId"];
7070
[param setObject:@([self serviceTypeToAdsType:self.config.type]) forKey:@"adsType"];
7171
[param setObject:@(self.config.duration) forKey:@"duration"];

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaServiceVideoMode.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
#import "VPLuaServiceVideoMode.h"
10-
#import "VPLuaCommonInfo.h"
10+
#import "VPUPCommonInfo.h"
1111
#import "VPUPHTTPBusinessAPI.h"
1212
#import "VPUPHTTPAPIManager.h"
1313
#import "VPUPHTTPManagerFactory.h"
@@ -55,7 +55,7 @@ - (void)requestServiceData {
5555
api.apiRequestMethodType = VPUPRequestMethodTypePOST;
5656

5757
NSMutableDictionary *param = [NSMutableDictionary dictionaryWithCapacity:0];
58-
[param setObject:[VPLuaCommonInfo commonParam] forKey:@"commonParam"];
58+
[param setObject:[VPUPCommonInfo commonParam] forKey:@"commonParam"];
5959
[param setObject:self.config.identifier forKey:@"videoId"];
6060

6161
NSString *paramString = VPUP_DictionaryToJson(param);

‎VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLuaTrackManager.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#import "VPUPHTTPManagerFactory.h"
1313
#import "VPLuaNetworkManager.h"
1414
#import "VPLuaSDK.h"
15-
#import "VPLuaCommonInfo.h"
15+
#import "VPUPCommonInfo.h"
1616

1717
@implementation VPLuaTrackManager
1818

@@ -23,7 +23,7 @@ + (void)trackVideoModeSwitch:(BOOL)isOpen {
2323
api.apiRequestMethodType = VPUPRequestMethodTypePOST;
2424

2525
NSMutableDictionary *param = [NSMutableDictionary dictionaryWithCapacity:0];
26-
[param setObject:[VPLuaCommonInfo commonParam] forKey:@"commonParam"];
26+
[param setObject:[VPUPCommonInfo commonParam] forKey:@"commonParam"];
2727
[param setObject:[VPLuaSDK sharedSDK].appKey forKey:@"appKey"];
2828
[param setObject: isOpen ? @"1" : @"0" forKey:@"onOrOff"];
2929

‎VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK/VideoPlsUtilsPlatformSDK.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@
9898
0641EBB31ED41E6F00C950A4 /* VPUPNotificationCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0641EBAF1ED41E6F00C950A4 /* VPUPNotificationCenter.m */; };
9999
0641EBB41ED41E6F00C950A4 /* VPUPNotificationCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0641EBAF1ED41E6F00C950A4 /* VPUPNotificationCenter.m */; };
100100
0641EBB51ED41E6F00C950A4 /* VPUPNotificationCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 0641EBAF1ED41E6F00C950A4 /* VPUPNotificationCenter.m */; };
101+
064B14602321FEDC00C2F392 /* VPUPCommonInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 064B145E2321FEDC00C2F392 /* VPUPCommonInfo.h */; };
102+
064B14612321FEDC00C2F392 /* VPUPCommonInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 064B145F2321FEDC00C2F392 /* VPUPCommonInfo.m */; };
101103
064D563E1EC449D300C9DEC4 /* VPUPLogUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 064D563A1EC449D300C9DEC4 /* VPUPLogUtil.m */; };
102104
064D563F1EC449D300C9DEC4 /* VPUPLogUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 064D563A1EC449D300C9DEC4 /* VPUPLogUtil.m */; };
103105
064D56401EC449D300C9DEC4 /* VPUPLogUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 064D563A1EC449D300C9DEC4 /* VPUPLogUtil.m */; };
@@ -1068,6 +1070,8 @@
10681070
063FDB911F0E17E800333B46 /* VPUPFLAnimatedImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPUPFLAnimatedImageView.m; sourceTree = "<group>"; };
10691071
0641EBAE1ED41E6F00C950A4 /* VPUPNotificationCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPUPNotificationCenter.h; sourceTree = "<group>"; };
10701072
0641EBAF1ED41E6F00C950A4 /* VPUPNotificationCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPUPNotificationCenter.m; sourceTree = "<group>"; };
1073+
064B145E2321FEDC00C2F392 /* VPUPCommonInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPUPCommonInfo.h; sourceTree = "<group>"; };
1074+
064B145F2321FEDC00C2F392 /* VPUPCommonInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPUPCommonInfo.m; sourceTree = "<group>"; };
10711075
064D56391EC449D300C9DEC4 /* VPUPLogUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPUPLogUtil.h; sourceTree = "<group>"; };
10721076
064D563A1EC449D300C9DEC4 /* VPUPLogUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VPUPLogUtil.m; sourceTree = "<group>"; };
10731077
064D56431EC47C3A00C9DEC4 /* VPUPSDKInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VPUPSDKInfo.h; sourceTree = "<group>"; };
@@ -1608,6 +1612,8 @@
16081612
D0BD1AB62130129F00A087F2 /* VPUPIPAddressUtil.m */,
16091613
D01E219D223E8EF90018A1AE /* VPUPUrlUtil.h */,
16101614
D01E219E223E8EF90018A1AE /* VPUPUrlUtil.m */,
1615+
064B145E2321FEDC00C2F392 /* VPUPCommonInfo.h */,
1616+
064B145F2321FEDC00C2F392 /* VPUPCommonInfo.m */,
16111617
06C7E92C230A8A9C000FEC1C /* VPUPTrafficStatistics.h */,
16121618
06C7E92D230A8A9C000FEC1C /* VPUPTrafficStatistics.m */,
16131619
);
@@ -2203,6 +2209,7 @@
22032209
06D57C251F18697E00C1C1BA /* VPUPOrderedDictionary.h in Headers */,
22042210
D0928C9B2088A0C2008AB5EC /* VPUPSDImageCacheConfig.h in Headers */,
22052211
065503B11EFA404E006FBADB /* VPUPHexColors.h in Headers */,
2212+
064B14602321FEDC00C2F392 /* VPUPCommonInfo.h in Headers */,
22062213
D0E943541FF0E1B50038BD8B /* VPUPAssetCell.h in Headers */,
22072214
062DB6791F1E30C2003788C1 /* VPUPFLAnimatedImage.h in Headers */,
22082215
D0928D012088A0C2008AB5EC /* NSImage+VPUPWebCache.h in Headers */,
@@ -2932,6 +2939,7 @@
29322939
D022A0B020BE6CA600F46029 /* VPUPVideoRequestTask.m in Sources */,
29332940
D05369C320576B6200A4F8C6 /* VPUPHTTPHost.m in Sources */,
29342941
D01E21A1223E8EF90018A1AE /* VPUPUrlUtil.m in Sources */,
2942+
064B14612321FEDC00C2F392 /* VPUPCommonInfo.m in Sources */,
29352943
06789B171EE979530052A705 /* VPUPPrefetchVideoManager.m in Sources */,
29362944
D004F7042099567700022E90 /* vpup_read_handle_client.c in Sources */,
29372945
D0BD1AAD212FE60600A087F2 /* VPUPRSAUtil.m in Sources */,

0 commit comments

Comments
 (0)