更新WadeMobile，适配Xcode12

IPUCommon/IPUMobile.framework/Headers/IPUFlipperView.h

@@ -8,6 +8,8 @@
#import <UIKit/UIKit.h>
#import "IPUMobileDelegate.h"
NS_ASSUME_NONNULL_BEGIN
typedef NS_OPTIONS(NSUInteger, IPUAnimationType) {
@@ -17,8 +19,6 @@ typedef NS_OPTIONS(NSUInteger, IPUAnimationType) {
    IPUAnimationFade                 = 1 << 2
};
@class IPUMobileWebView;
@interface IPUFlipperView : UIView
/**
@@ -47,7 +47,7 @@ typedef NS_OPTIONS(NSUInteger, IPUAnimationType) {
 @return <#return value description#>
 */
- (IPUMobileWebView *)getFormerView;
- (IPUCommonWebView)getFormerView;
/**
 显示下一级视图

IPUCommon/IPUMobile.framework/Headers/IPUMobileDelegate.h

@@ -11,20 +11,24 @@
@class IPUMobileWebView;
@protocol IPUCallbackProtocol;
typedef void(^WebViewLoadCompletion)(void);
@protocol IPUCallbackProtocol, IPUWebViewProtocol;
typedef id<IPUCallbackProtocol, IPUWebViewProtocol> IPUCommonWebView;
@protocol IPUMobileDelegate <NSObject>
/* 获取web视图的代理监听 */
@optional		
- (id <UIWebViewDelegate>)getWebViewDelegate;
- (id)getWebViewDelegate;
/* 获取当前web视图 */
@optional
- (IPUMobileWebView *)getCurrentWebView IPU_API_DEPRECATED("use '- (id <IPUCallbackProtocol>)getCurrentView' instead");
- (IPUMobileWebView *)getCurrentWebView IPU_API_DEPRECATED("use '- (IPUCommonWebView)getCurrentView' instead");
@optional
- (id <IPUCallbackProtocol>)getCurrentView;
- (IPUCommonWebView)getCurrentView;
/* 获取当前的视图集合对象 */
@optional
@@ -32,11 +36,11 @@
/* 创建一个新的web视图 */
@optional
- (IPUMobileWebView *)createNewWebView;
- (IPUCommonWebView)createNewWebView;
/* 设置WebView对象的样式 */
@optional
- (void)setUIWebViewStyle:(IPUMobileWebView *)webView;
- (void)setUIWebViewStyle:(IPUCommonWebView)webView;
@optional
- (UIViewController *)getViewController;
@@ -56,3 +60,52 @@
- (void)error:(NSString *)message callbackID:(NSString *)callbackID;
@end
@protocol IPUWebViewProtocol <NSObject>
@optional
@property (nonatomic, strong) NSString *pageAction;
@property (nonatomic, assign) BOOL scalesPageToFit;
@property (nonatomic, weak) id delegate;
@property (nonatomic, assign) CGRect frame;
@property (nonatomic, assign) CGRect bounds;
@property (nonatomic, strong) CALayer *layer;
@property (nonatomic, strong) UIScrollView *scrollView;
@property (nonatomic, copy) WebViewLoadCompletion loadCompletion;
@property (nonatomic, strong) UIView *superview;
@property (nonatomic, assign) BOOL translatesAutoresizingMaskIntoConstraints;
- (id)initWithFrame:(CGRect)frame;
- (void)loadUrl:(NSString *)urlString;
- (void)loadLocalUrl:(NSString *)filePath;
- (void)setBaseUrl:(NSString *)basePath;
- (void)loadRequest:(NSURLRequest *)request;
- (void)loadTemplate:(NSString *) filePath data:(IPUDataMap *)data;
- (NSString *)getTemplate:(NSString *) filePath data:(IPUDataMap *) data;
- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
- (BOOL)canGoBack;
- (void)goBack;
- (void)free;
- (void)reload;
@end

IPUCommon/IPUMobile.framework/Headers/IPUMobileWebView.h

@@ -14,7 +14,7 @@ typedef void(^WebViewLoadCompletion)(void);
@class IPUPlugin;
@interface IPUMobileWebView : UIWebView <IPUCallbackProtocol>
@interface IPUMobileWebView : UIWebView <IPUWebViewProtocol, IPUCallbackProtocol>
@property (nonatomic, copy) NSString *pageAction; // 页面名称

IPUCommon/IPUMobile.framework/Headers/IPUNetMainViewController.h

@@ -7,8 +7,7 @@
//
#import "IPUViewController.h"
@class IPUMobileWebView;
#import "IPUMobileDelegate.h"
@protocol IPUCurrentViewDelegate;
@@ -18,7 +17,7 @@
@property(nonatomic, weak) UIView *contentView;
@property(nonatomic, weak) IPUMobileWebView *webView;
@property(nonatomic, weak) IPUCommonWebView webView;
- (UIColor *)topViewBackgroundColor;

IPUCommon/IPUMobile.framework/Headers/IPUResVersionManager.h

@@ -87,6 +87,4 @@
/// @param dict <#dict description#>
+ (void)updateCachedDifferRes:(NSDictionary *)dict;
+ (void)deleteWillUpdateFile:(NSString *)filePath;
@end

IPUCommon/IPUMobile.framework/Headers/IPUTemplateViewController.h

@@ -8,7 +8,6 @@
#import "IPUViewController.h"
#import "IPUTemplateWebView.h"
#import "IPUFlipperView.h"
NS_ASSUME_NONNULL_BEGIN

IPUCommon/IPUMobile.framework/Headers/IPUTemplateWebView.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
@class IPUDataMap;
@interface IPUTemplateWebView : IPUMobileWebView
@interface IPUTemplateWebView : IPUMobileWebView <IPUWebViewProtocol, IPUCallbackProtocol>
{
    NSURL *baseUrl;
}

IPUCommon/IPUMobile.framework/Headers/IPUViewController.h

@@ -9,7 +9,6 @@
#import <UIKit/UIKit.h>
#import <UIKit/UIKit.h>
#import "IPUMobileWebView.h"
#import "IPUPluginManager.h"
#import "IPUMobileConfig.h"
#import "IPUConstant.h"
@@ -32,9 +31,9 @@ WKUIDelegate,
WKNavigationDelegate
>
{
    IPUMobileWebView *mobileWebView;
   IPUCommonWebView mobileWebView;
}
@property(nonatomic,strong)IPUProgressHUD *ipuHud;
@property (nonatomic, strong) IPUProgressHUD *ipuHud;
/**
 获取视图窗体大小

IPUCommon/IPUMobile.framework/Headers/IPUWebView.h

@@ -8,11 +8,11 @@
#import <WebKit/WebKit.h>
#import "IPUMobileWebView.h"
#import "IPUMobileDelegate.h"
@class IPUDataMap;
@interface IPUWebView : WKWebView
@interface IPUWebView : WKWebView <IPUWebViewProtocol, IPUCallbackProtocol>
{
    NSURL *baseUrl;
}
@@ -37,4 +37,6 @@
- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
- (void)free;
@end

IPUCommon/IPUMobileFunc.framework/Headers/IPUMobileUIPlugin.h

@@ -56,13 +56,13 @@
- (void)openTemplate:(NSString *)pageAction
            withData:(IPUDataMap *)data
              isCurr:(BOOL)isCurr;
              isCurr:(NSNumber *)isCurr;
- (void)openPage:(NSArray *)param;
- (void)openPage:(NSString *)pageAction
            data:(NSString *)dataParam
      isCurrView:(BOOL)isCurr;
      isCurrView:(NSNumber *)isCurr;
- (void)loadPage:(NSArray *)param;

IPUCommon/IPUMobileFunc.framework/Headers/IPUScreenCapture.h

@@ -14,21 +14,30 @@
 全屏截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)fullScreenCapture:(NSArray *)params;
- (void)fullScreenCapture:(NSArray *)params;
/*
 无状态栏截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)noStatusScreenCapture:(NSArray *)params;
- (void)noStatusScreenCapture:(NSArray *)params;
/*
 手动截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)handMovementScreenCapture:(NSArray *)params;
- (void)handMovementScreenCapture:(NSArray *)params;
/*
 webview长图截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)webviewScreenCapture:(NSArray *)params;
- (void)webviewScreenCapture:(NSArray *)params;
- (UIImage *)screenFullShot;
- (UIImage *)screenNoStatusShot;
- (UIImage *)screenWebviewShot;
@end

IPUMobileFunc/IPUMobileFunc.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
		<key>IPUMobileFunc.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>7</integer>
			<integer>8</integer>
		</dict>
		<key>IPUMobileFuncResource.xcscheme</key>
		<dict>

IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m

@@ -257,13 +257,13 @@
    IPUFlipperView *flipperView = [self.mobileDelegate getFlipperView];
    // 是否需要新开View
    if (isCurr.boolValue) {
        IPUTemplateWebView *tWebview = (IPUTemplateWebView *)[flipperView getCurrView];
        IPUCommonWebView tWebview = (IPUCommonWebView)[flipperView getCurrView];
        tWebview.pageAction = pageAction;
        [tWebview loadTemplate:templatePath data:data];
    } else {
        IPUTemplateWebView *tWebview = (IPUTemplateWebView *)[flipperView getNextView];
        IPUCommonWebView tWebview = (IPUCommonWebView)[flipperView getNextView];
        if (!tWebview) {
            tWebview = (IPUTemplateWebView*)[self.mobileDelegate createNewWebView];
            tWebview = [self.mobileDelegate createNewWebView];
            tWebview.delegate = self.mobileDelegate;
            [self.mobileDelegate setUIWebViewStyle:tWebview];
            [flipperView addView:tWebview];
@@ -295,11 +295,10 @@
}
- (NSString *)getTemplateHtml:(NSString *)pageAction widthData:(IPUDataMap *)data {
    IPUFlipperView *flipperView = [self.mobileDelegate getFlipperView];
    IPUTemplateWebView *tWebview = (IPUTemplateWebView *)[flipperView getCurrView];
    IPUCommonWebView webView = [self.mobileDelegate getCurrentView];
    
    NSString *templatePath = [IPUServerPage getTemplate:pageAction];
    return [tWebview getTemplate:templatePath data:data];
    return [webView getTemplate:templatePath data:data];
}
/**

IPUMobileFunc/IPUMobileFunc/IPUScreenCapture.m

@@ -8,16 +8,27 @@
#import "IPUScreenCapture.h"
#import <Photos/Photos.h>
typedef void(^IPUCommonCompletion)(BOOL success);
@interface IPUScreenCapture ()
{
    BOOL base64;
    BOOL isSaveToPhoto;
    IPUCommonCompletion completion;
}
@property (nonatomic, weak) UIView *clipLeftView;
@property (nonatomic, weak) UIView *clipRightView;
@property (nonatomic, weak) UIView *clipTopView;
@property (nonatomic, weak) UIView *clipBottomView;
@property (nonatomic, weak) UIView *clipView;
@property (nonatomic, assign) CGPoint startPoint;
@end
@@ -35,16 +46,30 @@
        base64 = NO;
    }
    
    if (params.count > 1 && params[1] != [NSNull null]) {
        if ([params[1] integerValue] == 0) {
            isSaveToPhoto = NO;
        } else {
            isSaveToPhoto = YES;
        }
    } else {
        isSaveToPhoto = NO;
    }
    
    UIImage *image = [self screenFullShot];
    NSString *path = [IPUUtility createDirInDocument:@"images"
                                        withFileName:nil
                                   withPathExtension:@"jpg"];
    NSData * data = UIImageJPEGRepresentation(image, 1.0);
    [data writeToFile:path atomically:YES];
    if (base64) {
        [self callback:[self base64EncodingWithData:data]];
    if (isSaveToPhoto) {
        __weak typeof(self) weakSelf = self;
        [self requestPhotoLibraryAuthorization:^(BOOL success) {
            __strong typeof(self) strongSelf = weakSelf;
            if (!success) {
                [strongSelf callback:@""];
                return;
            }
            
            [strongSelf callbackResultImage:image];
        }];
    } else {
        [self callback:path];
        [self callbackResultImage:image];
    }
}
@@ -58,14 +83,31 @@
    } else {
        base64 = NO;
    }
    
    if (params.count > 1 && params[1] != [NSNull null]) {
        if ([params[1] integerValue] == 0) {
            isSaveToPhoto = NO;
        } else {
            isSaveToPhoto = YES;
        }
    } else {
        isSaveToPhoto = NO;
    }
    
    UIImage *image = [self screenNoStatusShot];
    NSString* path = [IPUUtility createDirInDocument:@"images" withFileName:nil withPathExtension:@"jpg"];
    NSData * data = UIImageJPEGRepresentation(image, 1.0);
    [data writeToFile:path atomically:YES];
    if (base64) {
        [self callback:[self base64EncodingWithData:data]];
    if (isSaveToPhoto) {
        __weak typeof(self) weakSelf = self;
        [self requestPhotoLibraryAuthorization:^(BOOL success) {
            __strong typeof(self) strongSelf = weakSelf;
            if (!success) {
                [strongSelf callback:@""];
                return;
            }
            
            [strongSelf callbackResultImage:image];
        }];
    } else {
        [self callback:path];
        [self callbackResultImage:image];
    }
}
@@ -79,6 +121,17 @@
    } else {
        base64 = NO;
    }
    
    if (params.count > 1 && params[1] != [NSNull null]) {
        if ([params[1] integerValue] == 0) {
            isSaveToPhoto = NO;
        } else {
            isSaveToPhoto = YES;
        }
    } else {
        isSaveToPhoto = NO;
    }
    
    [self addPanGesture];
}
@@ -92,16 +145,32 @@
    } else {
        base64 = NO;
    }
    
    if (params.count > 1 && params[1] != [NSNull null]) {
        if ([params[1] integerValue] == 0) {
            isSaveToPhoto = NO;
        } else {
            isSaveToPhoto = YES;
        }
    } else {
        isSaveToPhoto = NO;
    }
    
    UIImage *image = [self screenWebviewShot];
    NSString* path = [IPUUtility createDirInDocument:@"images"
                                        withFileName:nil
                                   withPathExtension:@"jpg"];
    NSData * data = UIImageJPEGRepresentation(image, 1.0);
    [data writeToFile:path atomically:YES];
    if (base64) {
        [self callback:[self base64EncodingWithData:data]];
    
    if (isSaveToPhoto) {
        __weak typeof(self) weakSelf = self;
        [self requestPhotoLibraryAuthorization:^(BOOL success) {
            __strong typeof(self) strongSelf = weakSelf;
            if (!success) {
                [strongSelf callback:@""];
                return;
            }
            
            [strongSelf callbackResultImage:image];
        }];
    } else {
        [self callback:path];
        [self callbackResultImage:image];
    }
}
@@ -117,7 +186,7 @@
}
- (UIImage *)screenNoStatusShot {
    IPUMobileWebView *webview = [self getWebView];
    UIView *webview = (UIView *)[self getWebView];
    UIGraphicsBeginImageContextWithOptions(CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT), NO, 0.0);
    [webview.layer renderInContext:UIGraphicsGetCurrentContext()];
    UIImage *screenShotImage = UIGraphicsGetImageFromCurrentImageContext();
@@ -126,7 +195,8 @@
}
- (UIImage *)screenWebviewShot {
    IPUMobileWebView *webview = [self getWebView];
    IPUCommonWebView webview = [self.mobileDelegate getCurrentView];
    
    // 1.获取WebView的宽高
    CGSize boundsSize = webview.bounds.size;
    CGFloat boundsWidth = boundsSize.width;
@@ -238,15 +308,22 @@
        CGRect pxrect =  CGRectMake(self.clipView.left*px, self.clipView.top*px, self.clipView.width*px, self.clipView.height*px);
        CGImageRef imageRefRect = CGImageCreateWithImageInRect(imageRef, pxrect);
        UIImage *clipeImage = [[UIImage alloc] initWithCGImage:imageRefRect];
        //保存截图至本地，并callback本地路径给js
        NSString* path = [IPUUtility createDirInDocument:@"images" withFileName:nil withPathExtension:@"jpg"];
        NSData * data = UIImageJPEGRepresentation(clipeImage, 1.0);
        [data writeToFile:path atomically:YES];
        if (base64) {
            [self callback:[self base64EncodingWithData:data]];
        }else{
            [self callback:path];
        
        if (isSaveToPhoto) {
            __weak typeof(self) weakSelf = self;
            [self requestPhotoLibraryAuthorization:^(BOOL success) {
                __strong typeof(self) strongSelf = weakSelf;
                if (!success) {
                    [strongSelf callback:@""];
                    return;
                }
                
                [strongSelf callbackResultImage:clipeImage];
            }];
        } else {
            [self callbackResultImage:clipeImage];
        }
        
        //移除剪切区域视图控件，并清空
        [self.clipView removeFromSuperview];
        [self.clipBottomView removeFromSuperview];
@@ -274,7 +351,7 @@
}
- (UIView *)clipLeftView {
    if (_clipLeftView == nil) {
    if (!_clipLeftView) {
        UIView *view = [[UIView alloc] init];
        _clipLeftView = view;
        view.backgroundColor = [UIColor blackColor];
@@ -286,7 +363,7 @@
}
- (UIView *)clipRightView {
    if (_clipRightView == nil) {
    if (!_clipRightView) {
        UIView *view = [[UIView alloc] init];
        _clipRightView = view;
        view.backgroundColor = [UIColor blackColor];
@@ -298,7 +375,7 @@
}
- (UIView *)clipTopView {
    if (_clipTopView == nil) {
    if (!_clipTopView) {
        UIView *view = [[UIView alloc] init];
        _clipTopView = view;
        view.backgroundColor = [UIColor blackColor];
@@ -309,8 +386,8 @@
    return _clipTopView;
}
-(UIView *)clipBottomView{
    if (_clipBottomView==nil) {
- (UIView *)clipBottomView {
    if (!_clipBottomView) {
        UIView *view = [[UIView alloc] init];
        _clipBottomView = view;
        view.backgroundColor = [UIColor blackColor];
@@ -322,19 +399,98 @@
}
#pragma mark - other
-(void)captureScreen:(NSArray *)params{
- (void)captureScreen:(NSArray *)params{
    BOOL isCapture = false;
    if (params.count>0) {
        if (params[0]==[NSNull null]) {
    if (params.count > 0) {
        if (params[0] == [NSNull null]) {
            isCapture = false;
        }else{
        } else {
            isCapture = [params[0] boolValue];
        }
    }
    
    if (isCapture) {//允许截屏
        return;
    }
    
    [[NSNotificationCenter defaultCenter] addObserver:self
                                             selector:@selector(screenFullShot)
                                                 name:UIApplicationUserDidTakeScreenshotNotification
                                               object:nil];
}
- (void)saveScreenCaptureToPhotos:(UIImage *)image completion:(IPUCommonCompletion)completion {
    __weak typeof(self) weakSelf = self;
    [self requestPhotoLibraryAuthorization:^(BOOL success) {
        __strong typeof(self) strongSelf = weakSelf;
        if (!success) {
            [strongSelf callback:@""];
            return;
        }
        
    }else{//禁止截屏
        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(screenFullShot) name:UIApplicationUserDidTakeScreenshotNotification object:nil];
        strongSelf->completion = completion;
        
        // 图片保存到相册
        UIImageWriteToSavedPhotosAlbum(image, strongSelf, @selector(image:didFinishSavingWithError:contextInfo:), nil);
    }];
}
/*
 图片成功保存到相册回调
 */
- (void)image:(UIImage *)image didFinishSavingWithError:(NSError *)error contextInfo:(void *)contextInfo {
    if (!completion) {
        return;
    }
    
    completion(!error);
}
- (void)callbackResultImage:(UIImage *)image {
    NSData *data = UIImageJPEGRepresentation(image, 1.0);
    if (base64) {
        [self callback:[self base64EncodingWithData:data]];
    } else {
        NSString *path = [IPUUtility createDirInDocument:@"images"
                                            withFileName:nil
                                       withPathExtension:@"jpg"];
        [data writeToFile:path atomically:YES];
        [self callback:path];
    }
}
/// 申请相册权限
/// @param completion 结果回调
- (void)requestPhotoLibraryAuthorization:(IPUCommonCompletion)completion {
    if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
        completion(NO);
        return;
    }
    
    PHAuthorizationStatus authorizationStatus = [PHPhotoLibrary authorizationStatus];
    
    switch (authorizationStatus) {
        case PHAuthorizationStatusAuthorized:
        {
            completion(YES);
        }
            break;
        case PHAuthorizationStatusNotDetermined:
        {
            [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
                completion(status == PHAuthorizationStatusAuthorized);
            }];
        }
            break;
            
        case PHAuthorizationStatusDenied:
        case PHAuthorizationStatusRestricted:
        default:
        {
            completion(NO);
        }
            break;
    }
}

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

@@ -7,7 +7,7 @@
		<key>RNCamera.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>37</integer>
			<integer>35</integer>
		</dict>
	</dict>
</dict>

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

@@ -7,7 +7,7 @@
		<key>RNGestureHandler.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>22</integer>
			<integer>32</integer>
		</dict>
	</dict>
</dict>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>0</integer>
			<integer>1</integer>
		</dict>
		<key>RNVectorIcons.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>39</integer>
			<integer>27</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -7,7 +7,7 @@
		<key>RNCWebView.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>35</integer>
			<integer>31</integer>
		</dict>
	</dict>
</dict>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>11</integer>
			<integer>12</integer>
		</dict>
		<key>ART.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>32</integer>
			<integer>29</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -7,7 +7,7 @@
		<key>RCTCameraRoll.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>20</integer>
			<integer>28</integer>
		</dict>
	</dict>
</dict>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>4</integer>
		</dict>
		<key>RCTImage.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>26</integer>
			<integer>33</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>8</integer>
			<integer>9</integer>
		</dict>
		<key>RCTLinking.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>33</integer>
			<integer>39</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>5</integer>
			<integer>6</integer>
		</dict>
		<key>RCTAnimation.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>30</integer>
			<integer>22</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>1</integer>
			<integer>2</integer>
		</dict>
		<key>RCTNetwork.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>31</integer>
			<integer>25</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>9</integer>
			<integer>10</integer>
		</dict>
		<key>RCTSettings.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>29</integer>
			<integer>36</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,12 +9,12 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>13</integer>
			<integer>14</integer>
		</dict>
		<key>RCTText.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>28</integer>
			<integer>40</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,24 +9,24 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>15</integer>
			<integer>16</integer>
		</dict>
		<key>RCTWebSocket.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>40</integer>
			<integer>41</integer>
		</dict>
		<key>fishhook-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>17</integer>
			<integer>18</integer>
		</dict>
		<key>fishhook.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>25</integer>
			<integer>34</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,96 +9,96 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>4</integer>
			<integer>5</integer>
		</dict>
		<key>React.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>19</integer>
			<integer>20</integer>
		</dict>
		<key>cxxreact-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>12</integer>
			<integer>13</integer>
		</dict>
		<key>cxxreact.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>36</integer>
			<integer>30</integer>
		</dict>
		<key>double-conversion-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>14</integer>
			<integer>15</integer>
		</dict>
		<key>double-conversion.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>21</integer>
			<integer>42</integer>
		</dict>
		<key>jsi-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>16</integer>
			<integer>17</integer>
		</dict>
		<key>jsi.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>34</integer>
			<integer>38</integer>
		</dict>
		<key>jsiexecutor-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>18</integer>
			<integer>19</integer>
		</dict>
		<key>jsiexecutor.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>24</integer>
			<integer>23</integer>
		</dict>
		<key>jsinspector-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>7</integer>
			<integer>8</integer>
		</dict>
		<key>jsinspector.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>38</integer>
			<integer>37</integer>
		</dict>
		<key>third-party-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>10</integer>
			<integer>11</integer>
		</dict>
		<key>third-party.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>23</integer>
			<integer>26</integer>
		</dict>
		<key>yoga-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>6</integer>
			<integer>7</integer>
		</dict>
		<key>yoga.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>27</integer>
			<integer>21</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

SuperMenu/Res/config/mobile-config.xml

@@ -57,5 +57,6 @@
    <config name="j_push_channel" value="Publish channel"/>
    <config name="j_push_production" value="false"/>
    <config name="baidu_map_key" value="lFs1DdNVs4PVvlQ0qZnV9hWp90B2gwgp"/>
    <config name="WebView" value="WKWebView"/>
    
</configs>

SuperMenu/SuperMenu.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
		<key>SuperMenu.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>2</integer>
			<integer>3</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

SuperMenu/SuperMenu.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,9 @@
<Workspace
   version = "1.0">
   <FileRef
      location = "group:../../iOS/IPUMobile/IPUMobile.xcodeproj">
   </FileRef>
   <FileRef
      location = "group:SuperMenu.xcodeproj">
   </FileRef>
</Workspace>

SuperMenu/SuperMenu.xcworkspace/xcuserdata/benny.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -15,21 +15,5 @@
            stopOnStyle = "0">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "3E9146BF-91B0-45B3-97A9-095A595CD90A"
            shouldBeEnabled = "No"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "SuperMenu/IPUFlipperView+Addition.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "27"
            endingLineNumber = "27"
            landmarkName = "-swizzle_addSubview:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
   </Breakpoints>
</Bucket>

SuperMenu/SuperMenu/ViewController.mm

@@ -117,7 +117,7 @@
}
- (void)openPage:(NSString *)pageName {
    IPUMobileWebView *webView = [self getCurrentWebView];
    IPUCommonWebView webView = [self getCurrentView];
    if ([webView.pageAction isEqualToString:pageName]) {
        return;
    }
@@ -129,7 +129,7 @@
- (void)back {
    UIViewController *viewController = [self getCurrentViewController];
    
    IPUMobileWebView *webView = [self getCurrentWebView];
    IPUCommonWebView webView = [self getCurrentView];
    if ([webView.pageAction isEqualToString:@"Login"]) {
        [self alert:@"提示" content:@"当前为最上层页面，无法返回！"];
@@ -140,7 +140,7 @@
        [viewController dismissViewControllerAnimated:YES completion:nil];
    } else if ([viewController isKindOfClass:[IPUViewController class]]) {
        IPUViewController *wdViewController = (IPUViewController *)viewController;
        UIWebView *webView = [wdViewController getCurrentWebView];
        IPUCommonWebView webView = [self getCurrentView];
        if ([webView canGoBack]) {
            [webView goBack];
        } else {

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>23</integer>
			<integer>24</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,14 +9,14 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>2</integer>
			<integer>3</integer>
		</dict>
		<key>RNVectorIcons.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>24</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>22</integer>
			<integer>23</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>17</integer>
			<integer>18</integer>
		</dict>
		<key>ART.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>4</integer>
			<integer>5</integer>
		</dict>
		<key>RCTImage.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>10</integer>
			<integer>11</integer>
		</dict>
		<key>RCTLinking.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>6</integer>
			<integer>7</integer>
		</dict>
		<key>RCTAnimation.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>3</integer>
			<integer>4</integer>
		</dict>
		<key>RCTNetwork.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>1</integer>
			<integer>2</integer>
		</dict>
		<key>RCTSettings.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>14</integer>
			<integer>15</integer>
		</dict>
		<key>RCTText.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,7 +9,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>16</integer>
			<integer>17</integer>
		</dict>
		<key>RCTWebSocket.xcscheme_^#shared#^_</key>
		<dict>
@@ -23,7 +23,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>19</integer>
			<integer>20</integer>
		</dict>
		<key>fishhook.xcscheme_^#shared#^_</key>
		<dict>

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

@@ -9,21 +9,21 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>5</integer>
			<integer>6</integer>
		</dict>
		<key>React.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>11</integer>
			<integer>12</integer>
		</dict>
		<key>cxxreact-tvOS.xcscheme_^#shared#^_</key>
		<dict>
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>13</integer>
			<integer>14</integer>
		</dict>
		<key>cxxreact.xcscheme_^#shared#^_</key>
		<dict>
@@ -37,7 +37,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>15</integer>
			<integer>16</integer>
		</dict>
		<key>double-conversion.xcscheme_^#shared#^_</key>
		<dict>
@@ -51,7 +51,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>18</integer>
			<integer>19</integer>
		</dict>
		<key>jsi.xcscheme_^#shared#^_</key>
		<dict>
@@ -65,7 +65,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>20</integer>
			<integer>21</integer>
		</dict>
		<key>jsiexecutor.xcscheme_^#shared#^_</key>
		<dict>
@@ -79,7 +79,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>9</integer>
			<integer>10</integer>
		</dict>
		<key>jsinspector.xcscheme_^#shared#^_</key>
		<dict>
@@ -93,7 +93,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>12</integer>
			<integer>13</integer>
		</dict>
		<key>third-party.xcscheme_^#shared#^_</key>
		<dict>
@@ -107,7 +107,7 @@
			<key>isShown</key>
			<false/>
			<key>orderHint</key>
			<integer>8</integer>
			<integer>9</integer>
		</dict>
		<key>yoga.xcscheme_^#shared#^_</key>
		<dict>

display-center/Res/config/mobile-config.xml

@@ -3,8 +3,8 @@
    <config name="request_host" value="http://www.aiipu.com:8083"/>
    <config name="request_path" value="/show"/>
<!--    <config name="request_host" value="http://192.168.1.170:8070"/>-->
<!--    <config name="request_path" value="/show-server"/>-->
<!--    <config name="request_host" value="http://192.168.1.171:8070"/>-->
<!--    <config name="request_path" value="/show"/>-->
    
    <config name="request_servlet" value="/mobiledata"/>
    <config name="loading_page" value="Res/local/welcome.html"/>

display-center/display-center.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
		<key>display-center.xcscheme_^#shared#^_</key>
		<dict>
			<key>orderHint</key>
			<integer>21</integer>
			<integer>22</integer>
		</dict>
	</dict>
	<key>SuppressBuildableAutocreation</key>

display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -66,38 +66,6 @@
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "0B263F44-49DA-4EBB-82EA-13C5A41C1A7E"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../../iOS/IPUMobile/IPUMobile/IPUViewController.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "530"
            endingLineNumber = "530"
            landmarkName = "-webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "7AF98E6D-5C8C-4E0C-AAAC-F788CA7AA4B8"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "../../iOS/IPUMobile/IPUMobile/IPUViewController.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "644"
            endingLineNumber = "644"
            landmarkName = "-webView:didFailNavigation:withError:"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "FD19D7B6-6219-4AAC-A65E-267AB2D4350D"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"

display-center/display-center/IPUFaceCheckPlugin.m

@@ -29,14 +29,14 @@
 */
#pragma -mark 识别
- (void)faceCheck:(NSArray *)params {
    NSLog(@"IPU faceCheck params = %@",params);
     [self opreateParams:params isRegister:NO];
    [self opreateParams:params isRegister:NO];
}
#pragma -mark 注册
- (void)faceRegister:(NSArray *)params {
    NSLog(@"IPU faceRegister params = %@",params);
    [self opreateParams:params isRegister:YES];
}
@@ -50,10 +50,8 @@
        imgType = [params[2] intValue];
    }
    NSString *host = [IPUMobileConfig getValue:@"face_host"];
    NSLog(@"IPUFaceCheck host = %@",host);
    if (imgType == 0) {
        IpuFaceCheckViewController *viewController = [[IpuFaceCheckViewController alloc] init];
//        viewController.plugin = self;
        viewController.isRegister = isRegister;
        viewController.appid = appid;
        viewController.uid = uid;
@@ -83,7 +81,6 @@
#pragma -mark IpuFacecheckViewControllerDelegate
- (void)backMsg:(NSDictionary *)callBackDic {
    NSLog(@"back Msg content = %@",callBackDic);
    [self callback:[IPUJSONHelper toJSONString:callBackDic]];
}

display-center/display-center/IPUViewController+IPUOverrideJSAlert.m

@@ -18,8 +18,6 @@
@implementation IPUViewController (IPUOverrideJSAlert)
+ (void)load {
//    return;
    
    NSError *error = nil;
    [self jr_swizzleMethod:@selector(webViewDidFinishLoad:)
                withMethod:@selector(ipuOverride_webViewDidFinishLoad:)
@@ -40,13 +38,7 @@
        NSString *action = params[0];
        NSString *callbackID = params[1];
        NSArray *param = [IPUJSONHelper toArray:params[2]];
        
        NSLog(@"::::::::::::::::::");
        NSLog(@"当前线程: %@", [NSThread currentThread]);
        NSLog(@"插件Action: %@", action);
        NSLog(@"参数: %@", param);
        NSLog(@"::::::::::::::::::");
        
        dispatch_async(dispatch_get_main_queue(), ^{
            [IPUPluginManager execute:self
                               action:action

display-center/display-center/ViewController.m

@@ -54,7 +54,6 @@
    });
}
- (void)back {
    UIViewController *viewController = [IPUUITool getCurrentViewController];