update recent code

Author: shshjing

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK.xcodeproj/project.pbxproj

@@ -9,6 +9,10 @@
 /* Begin PBXBuildFile section */
 		0614EAD722F020D9002DD6F4 /* VPLMPView.h in Headers */ = {isa = PBXBuildFile; fileRef = 0614EAD522F020D8002DD6F4 /* VPLMPView.h */; };
 		0614EAD822F020D9002DD6F4 /* VPLMPView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0614EAD622F020D8002DD6F4 /* VPLMPView.m */; };
+		0620393D23B1F1EB002256B1 /* VPLMPAddRecent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0620393B23B1F1EB002256B1 /* VPLMPAddRecent.h */; };
+		0620393E23B1F1EB002256B1 /* VPLMPAddRecent.m in Sources */ = {isa = PBXBuildFile; fileRef = 0620393C23B1F1EB002256B1 /* VPLMPAddRecent.m */; };
+		0620394123B34AEA002256B1 /* VPLMPOpenAds.h in Headers */ = {isa = PBXBuildFile; fileRef = 0620393F23B34AEA002256B1 /* VPLMPOpenAds.h */; };
+		0620394223B34AEA002256B1 /* VPLMPOpenAds.m in Sources */ = {isa = PBXBuildFile; fileRef = 0620394023B34AEA002256B1 /* VPLMPOpenAds.m */; };
 		063A124422F3CE230027B6A2 /* VPLMPBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 063A124222F3CE230027B6A2 /* VPLMPBridge.h */; };
 		063A124522F3CE230027B6A2 /* VPLMPBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 063A124322F3CE230027B6A2 /* VPLMPBridge.m */; };
 		063ABC052004C6AC001A8B94 /* VPLGradientView.h in Headers */ = {isa = PBXBuildFile; fileRef = 063ABC032004C6AC001A8B94 /* VPLGradientView.h */; };
@@ -199,6 +203,10 @@
 /* Begin PBXFileReference section */
 		0614EAD522F020D8002DD6F4 /* VPLMPView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLMPView.h; sourceTree = "<group>"; };
 		0614EAD622F020D8002DD6F4 /* VPLMPView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLMPView.m; sourceTree = "<group>"; };
+		0620393B23B1F1EB002256B1 /* VPLMPAddRecent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLMPAddRecent.h; sourceTree = "<group>"; };
+		0620393C23B1F1EB002256B1 /* VPLMPAddRecent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLMPAddRecent.m; sourceTree = "<group>"; };
+		0620393F23B34AEA002256B1 /* VPLMPOpenAds.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLMPOpenAds.h; sourceTree = "<group>"; };
+		0620394023B34AEA002256B1 /* VPLMPOpenAds.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLMPOpenAds.m; sourceTree = "<group>"; };
 		063A124222F3CE230027B6A2 /* VPLMPBridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLMPBridge.h; sourceTree = "<group>"; };
 		063A124322F3CE230027B6A2 /* VPLMPBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VPLMPBridge.m; sourceTree = "<group>"; };
 		063ABC032004C6AC001A8B94 /* VPLGradientView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VPLGradientView.h; sourceTree = "<group>"; };
@@ -561,6 +569,10 @@
 				D05FA9162303C2FB00C24653 /* VPLTrackManager.m */,
 				06571F9223851B4100C6C4D6 /* VPLMPRedirectManager.h */,
 				06571F9323851B4100C6C4D6 /* VPLMPRedirectManager.m */,
+				0620393B23B1F1EB002256B1 /* VPLMPAddRecent.h */,
+				0620393C23B1F1EB002256B1 /* VPLMPAddRecent.m */,
+				0620393F23B34AEA002256B1 /* VPLMPOpenAds.h */,
+				0620394023B34AEA002256B1 /* VPLMPOpenAds.m */,
 			);
 			path = Manager;
 			sourceTree = "<group>";
@@ -651,6 +663,7 @@
 				D0114C251FCFBFCD00E75EF7 /* VPLLoadingView.h in Headers */,
 				D0ADC49222EA8BD40037A549 /* VPLConstant.h in Headers */,
 				063A124422F3CE230027B6A2 /* VPLMPBridge.h in Headers */,
+				0620393D23B1F1EB002256B1 /* VPLMPAddRecent.h in Headers */,
 				069D37CC20207CB700CB177D /* VPLWindow.h in Headers */,
 				D0114C351FCFBFCD00E75EF7 /* VPLNativeBridge.h in Headers */,
 				D0ADC4A222ED82B70037A549 /* VPLServiceAd.h in Headers */,
@@ -668,6 +681,7 @@
 				063ABC052004C6AC001A8B94 /* VPLGradientView.h in Headers */,
 				06D474AC22F8088900C9DADD /* VPMPContainerNetworkView.h in Headers */,
 				D0114C161FCFBFCD00E75EF7 /* VPLBaseView.h in Headers */,
+				0620394123B34AEA002256B1 /* VPLMPOpenAds.h in Headers */,
 				D0114C3E1FCFBFCD00E75EF7 /* VPLTrackApi.h in Headers */,
 				D0928C3F207CC135008AB5EC /* VPLPage.h in Headers */,
 				06B02A7823753D43004E546D /* UIView+VPLView.h in Headers */,
@@ -804,6 +818,7 @@
 				D05369992051067100A4F8C6 /* VPLMQTT.m in Sources */,
 				0692ECFE1FF5EFA9008A3214 /* VPLNativeScanner.m in Sources */,
 				D00ED8E8202DAB6700B6C8C1 /* VPLMedia.m in Sources */,
+				0620393E23B1F1EB002256B1 /* VPLMPAddRecent.m in Sources */,
 				D0114C331FCFBFCD00E75EF7 /* VPLBaseNode.m in Sources */,
 				0640FAE61FE8EDF90089825F /* VPLNormalRefreshHeader.m in Sources */,
 				D00ED8E3202C41AC00B6C8C1 /* VPLScriptManager.m in Sources */,
@@ -814,6 +829,7 @@
 				D0114C201FCFBFCD00E75EF7 /* VPLImageView.m in Sources */,
 				064C92F22314CB660050D862 /* VPMPLandscapeNavigationBar.m in Sources */,
 				067A769922F03C5E008FC043 /* VPLMPLandscapeContainer.m in Sources */,
+				0620394223B34AEA002256B1 /* VPLMPOpenAds.m in Sources */,
 				D004F65A2093103000022E90 /* VPLuaServiceManager.m in Sources */,
 				D0BD1AC02138DE2100A087F2 /* VPLSDK.m in Sources */,
 				D05FA9182303C2FB00C24653 /* VPLTrackManager.m in Sources */,

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Applets/Network/VPLMPRequest.m

@@ -124,7 +124,7 @@ - (NSString *)requestWithMPID:(NSString *)mpID
 }
 
 - (void)trackWithMPID:(NSString *)mpID
-               apiManager:(id<VPUPHTTPAPIManager>)apiManager {
+           apiManager:(id<VPUPHTTPAPIManager>)apiManager {
 
     [self createHTTPManagerWith:apiManager];
 

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Applets/VPLMPView.m

@@ -19,13 +19,16 @@
 #import "VPHMPLandscapeContainer.h"
 #import "VPLOSView.h"
 #import "VPLMPRequest.h"
+#import "VPLMPAddRecent.h"
 
 @interface VPLMPView () <VPMPContainerDelegate>
 
 @property (nonatomic, weak) VPLNetworkManager *networkManager;
 
 @property (nonatomic) NSMutableDictionary<NSString *, id<VPMPContainer>> *containers;
 
+@property (nonatomic) NSMutableArray *currentMPIDs;
+
 @property (nonatomic,   copy) NSString *lPath;
 
 @property (nonatomic, assign) BOOL isFullScreen;
@@ -228,6 +231,9 @@ - (void)loadMPWithID:(NSString *)mpID data:(id)data {
         if (!self.containers) {
             self.containers = [NSMutableDictionary dictionary];
         }
+        if (!self.currentMPIDs) {
+            self.currentMPIDs = [NSMutableArray array];
+        }
 
         NSDictionary *queryParams = [data objectForKey:VPUPRouteQueryParamsKey];
 
@@ -302,7 +308,10 @@ - (void)createNewContainerWithType:(VPMPContainerType)type
             [container showInSuperview:self];
 
             //track appletId
-            [[VPLMPRequest request] trackWithMPID:mpID apiManager:self.networkManager.httpManager];
+//            [[VPLMPRequest request] trackWithMPID:mpID apiManager:self.networkManager.httpManager];
+            [VPLMPAddRecent addRecentWithMPID:mpID];
+            //send close & open applet
+            [self checkAndAddNewMPTrack:mpID];
 
             break;
         }
@@ -349,7 +358,10 @@ - (void)refereshContainerWithMPID:(NSString *)mpID
     [container refreshContainerWithData:data];
 
     //track appletId
-    [[VPLMPRequest request] trackWithMPID:mpID apiManager:self.networkManager.httpManager];
+//    [[VPLMPRequest request] trackWithMPID:mpID apiManager:self.networkManager.httpManager];
+    [VPLMPAddRecent addRecentWithMPID:mpID];
+    //send close & open applet
+    [self checkAndAddNewMPTrack:mpID];
 }
 
 - (BOOL)checkContainerExistWithMPID:(NSString *)mpID {
@@ -369,11 +381,56 @@ - (void)closeAllContainers {
         [obj closeContainer];
     }];
     [self.containers removeAllObjects];
+    
+    //移除发送关闭
+    if (self.currentMPIDs.count > 0) {
+        [self closeMPTrack:[self.currentMPIDs lastObject]];
+        [self.currentMPIDs removeAllObjects];
+    }
 }
 
 - (void)deleteContainerWithMPID:(NSString *)mpID {
     if ([self checkContainerExistWithMPID:mpID]) {
         [self.containers removeObjectForKey:mpID];
+        
+        //移除单个发送单个关闭
+        [self checkAndCloseLastMPTrack:mpID];
+    }
+}
+
+- (void)closeMPTrack:(NSString *)mpID {
+    [[VPUPCommonTrack shared] sendTrackWithType:VPUPCommonTrackTypeCloseMP dataDict:@{@"appletId": mpID}];
+}
+
+- (void)openMPTrack:(NSString *)mpID {
+    [[VPUPCommonTrack shared] sendTrackWithType:VPUPCommonTrackTypeOpenMP dataDict:@{@"appletId": mpID}];
+}
+
+- (void)checkAndAddNewMPTrack:(NSString *)newMPID {
+    //打开新的，如果存在旧的则关闭旧的，如果是最后一个是当前小程序则什么都不发
+    if (self.currentMPIDs.count > 0) {
+        if ([[self.currentMPIDs lastObject] isEqualToString:newMPID]) {
+            return;
+        }
+        [self closeMPTrack:[self.currentMPIDs lastObject]];
+    }
+    
+    [self openMPTrack:newMPID];
+    
+    if ([self.currentMPIDs containsObject:newMPID]) {
+        [self.currentMPIDs removeObject:newMPID];
+    }
+    
+    [self.currentMPIDs addObject:newMPID];
+}
+
+- (void)checkAndCloseLastMPTrack:(NSString *)closeMPID {
+    //先关闭当前
+    [self closeMPTrack:closeMPID];
+    [self.currentMPIDs removeObject:closeMPID];
+    //再检测有没有需要打开的
+    if (self.currentMPIDs.count > 0) {
+        [self openMPTrack:[self.currentMPIDs lastObject]];
     }
 }
 

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLMPAddRecent.h

@@ -0,0 +1,17 @@
+//
+//  VPLMPAddRecent.h
+//  VideoPlsLuaViewManagerSDK
+//
+//  Created by Zard1096-videojj on 2019/12/24.
+//  Copyright © 2019 videopls. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface VPLMPAddRecent : NSObject
+
++ (void)addRecentWithMPID:(NSString *)mpID;
+
+@end
+

VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VideoPlsLuaViewManagerSDK/VPLua/Manager/VPLMPAddRecent.m

@@ -0,0 +1,45 @@
+//
+//  VPLMPAddRecent.m
+//  VideoPlsLuaViewManagerSDK
+//
+//  Created by Zard1096-videojj on 2019/12/24.
+//  Copyright © 2019 videopls. All rights reserved.
+//
+
+#import "VPLMPAddRecent.h"
+#import "VPUPLocalStorage.h"
+#import "VPUPGeneralInfo.h"
+#import "VPUPJsonUtil.h"
+
+@implementation VPLMPAddRecent
+
++ (void)addRecentWithMPID:(NSString *)mpID {
+    
+    NSString *recentString = [VPUPLocalStorage getStorageDataWithFile:[VPUPGeneralInfo userIdentity] key:@"recentMiniAppId"];
+    
+    NSMutableArray *mpArray = [NSMutableArray array];
+    
+    if (recentString) {
+        NSArray *dataArray = VPUP_JsonToDictionary(recentString);
+        if (dataArray && [dataArray isKindOfClass:[NSArray class]] && dataArray.count > 0) {
+            [mpArray addObjectsFromArray:dataArray];
+        }
+    }
+    
+    if ([mpArray containsObject:mpID]) {
+        [mpArray removeObject:mpID];
+    }
+    
+    [mpArray insertObject:mpID atIndex:0];
+    
+    if ([mpArray count] > 21) {
+        [mpArray removeObjectsInRange:NSMakeRange(21, [mpArray count] - 21)];
+    }
+    
+    NSString *savedString = VPUP_DictionaryToJson(mpArray);
+    
+    [VPUPLocalStorage setStorageDataWithFile:[VPUPGeneralInfo userIdentity] key:@"recentMiniAppId" value:savedString];
+    
+}
+
+@end