修复backWithCallback多层返回的问题

IPUCommon/IPUMobile.framework/Headers/IPUFlipperView.h

@@ -128,6 +128,11 @@ typedef NS_OPTIONS(NSUInteger, IPUAnimationType) {
 */
- (NSUInteger)getViewOffset:(NSString *)pageAction;
/// 获取指定pageAction View的offset以及视图对象
/// @param pageAction <#pageAction description#>
/// @param destinationView <#destinationView description#>
- (NSUInteger)getViewOffert:(NSString *)pageAction view:(UIView **)destinationView;
@end
NS_ASSUME_NONNULL_END

IPUCommon/IPUMobile.framework/Headers/IPUPlugin.h

@@ -12,8 +12,6 @@
#import "IPUMobileDelegate.h"
typedef void(^IPUPlugnCompletion)(BOOL success, NSString *result);
@protocol IPUPluginProtocol;
@class IPUMobileWebView;
@@ -36,6 +34,4 @@ typedef void(^IPUPlugnCompletion)(BOOL success, NSString *result);
- (UIViewController *)getViewController;
@property (nonatomic, copy) IPUPlugnCompletion success;
@end

IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m

@@ -673,7 +673,18 @@
    }
    NSString *result = param[0];    // 回调数据
    IPUFlipperView *flipperView = (IPUFlipperView *)[(UIView *)[self.mobileDelegate getCurrentView] superview];
    UIView *formerView = [flipperView getFormerView];   // 获取上一个视图
    UIView *formerView = nil;
    if (!param[1] || [param[1] isKindOfClass:[NSNull class]]) {
        formerView = [flipperView getFormerView];   // 获取上一个视图
        [flipperView backWithCount:1];
    } else {
        // 多层级返回
        NSString *pageAction = param[1];
        NSInteger count = [flipperView getViewOffert:pageAction view:&formerView];
            
        [flipperView backWithCount:count];
    }
    if ([formerView isKindOfClass:[UIWebView class]] ||
        [formerView isKindOfClass:NSClassFromString(@"WKWebView")]) {   // 上一个视图注入js
        // 构造需要注入的js
@@ -683,11 +694,6 @@
        // ReactNative RCTRootView 预留
        // ...
    }
    // 返回到上一个页面
    NSString *pageAction = param[1];
    // 目标视图与当前视图的偏移量，默认为1，即当前视图的上一层视图
    NSInteger count = [flipperView getViewOffset:pageAction];
    [flipperView backWithCount:count];
}
- (void)openWindow:(NSArray *)param {
@@ -703,19 +709,12 @@
    
    UIViewController *rootCtrl = [self getViewController];
    if (rootCtrl.presentedViewController) {
        [rootCtrl dismissViewControllerAnimated:NO completion:nil];
        [rootCtrl.presentedViewController dismissViewControllerAnimated:NO completion:nil];
    }
    
    IPUWindowViewController *window = [[IPUWindowViewController alloc] init];
    window.modalPresentationStyle = UIModalPresentationFullScreen;
    
    // 设置透明效果
    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0) {
            
    } else {
        rootCtrl.modalPresentationStyle = UIModalPresentationCurrentContext;
    }
    
    window.pageAction = pageAction;
    window.pageData = pageParam;
    window.plugin = self;
@@ -749,8 +748,7 @@
- (void)getPage:(NSArray *)param {
    NSString *pageAction = param[0];
    NSObject *dataParam = param[1];
    
    NSObject *dataParam = param[1];    
    NSString *dataAction = [IPUServerPage getData:pageAction];
    IPUDataMap *pageParam = nil;
    if (dataAction) {

display-center/ReactNative/node_modules/react-native-camera/ios/RNCamera.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>28</integer>
			<integer>27</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native-gesture-handler/ios/RNGestureHandler.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>24</integer>
			<integer>23</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>26</integer>
			<integer>25</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native-webview/ios/RNCWebView.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>23</integer>
			<integer>22</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/ART/ART.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>31</integer>
			<integer>30</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>32</integer>
			<integer>31</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Image/RCTImage.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>30</integer>
			<integer>29</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>34</integer>
			<integer>33</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>29</integer>
			<integer>28</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>27</integer>
			<integer>26</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>35</integer>
			<integer>34</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/Text/RCTText.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>36</integer>
			<integer>35</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -16,7 +16,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>37</integer>
			<integer>36</integer>
		</dict>
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -30,7 +30,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>33</integer>
			<integer>32</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/ReactNative/node_modules/react-native/React/React.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -30,7 +30,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>38</integer>
			<integer>37</integer>
		</dict>
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -44,7 +44,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>40</integer>
			<integer>39</integer>
		</dict>
		<key>jsi-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -58,7 +58,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>43</integer>
			<integer>42</integer>
		</dict>
		<key>jsiexecutor-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -72,7 +72,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>44</integer>
			<integer>43</integer>
		</dict>
		<key>jsinspector-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -86,7 +86,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>41</integer>
			<integer>40</integer>
		</dict>
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -100,7 +100,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>42</integer>
			<integer>41</integer>
		</dict>
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
		<dict>
@@ -114,7 +114,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>39</integer>
			<integer>38</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/display-center.xcworkspace/contents.xcworkspacedata

@@ -11,12 +11,6 @@
      location = "group:../../iOS/IPUMobileUI/IPUMobileUI.xcodeproj">
   </FileRef>
   <FileRef
      location = "group:../../iOS-Plugin/IpuPush/IpuPush.xcodeproj">
   </FileRef>
   <FileRef
      location = "group:../../iOS-Plugin/IPUBaiduMap/IPUBaiduMap.xcodeproj">
   </FileRef>
   <FileRef
      location = "group:display-center.xcodeproj">
   </FileRef>
</Workspace>