getSysInfo 增加IPU_IMEI选项

IPUMobileFunc/IPUMobileFunc/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/IPUScreenCapture.m

@@ -8,60 +8,54 @@
#import "IPUScreenCapture.h"
@interface IPUScreenCapture()
@interface IPUScreenCapture ()
{
    BOOL base64;
}
@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, 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
@implementation IPUScreenCapture
/*
 全屏截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)fullScreenCapture:(NSArray *)params{
    if (params.count>0 && params[0]!=[NSNull null]) {
        if ([params[0] integerValue]==0) {
- (void)fullScreenCapture:(NSArray *)params {
    if (params.count && params[0] != [NSNull null]) {
        if (![params[0] integerValue]) {
            base64 = NO;
        }else{
        } else {
            base64 = YES;
        }
    }else{
    } else {
        base64 = NO;
    }
    
    UIImage *image = [self screenFullShot];
    NSString* path = [IPUUtility createDirInDocument:@"images" withFileName:nil withPathExtension:@"jpg"];
    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]];
    }else{
    } else {
        [self callback:path];
    }
}
/*
 无状态栏截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)noStatusScreenCapture:(NSArray *)params{
    if (params.count>0 && params[0]!=[NSNull null]) {
        if ([params[0] integerValue]==0) {
- (void)noStatusScreenCapture:(NSArray *)params {
    if (params.count && params[0] != [NSNull null]) {
        if (![params[0] integerValue]) {
            base64 = NO;
        }else{
        } else {
            base64 = YES;
        }
    }else{
    } else {
        base64 = NO;
    }
    UIImage *image = [self screenNoStatusShot];
@@ -70,54 +64,49 @@
    [data writeToFile:path atomically:YES];
    if (base64) {
        [self callback:[self base64EncodingWithData:data]];
    }else{
    } else {
        [self callback:path];
    }
}
/*
 手动截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)handMovementScreenCapture:(NSArray *)params{
    if (params.count>0 && params[0]!=[NSNull null]) {
        if ([params[0] integerValue]==0) {
- (void)handMovementScreenCapture:(NSArray *)params {
    if (params.count > 0 && params[0] != [NSNull null]) {
        if ([params[0] integerValue] == 0) {
            base64 = NO;
        }else{
        } else {
            base64 = YES;
        }
    }else{
    } else {
        base64 = NO;
    }
    [self addPanGesture];
}
/*
 webview长图截屏
 参数1:0-文件路径，1-base64编码
 */
-(void)webviewScreenCapture:(NSArray *)params{
    if (params.count>0 && params[0]!=[NSNull null]) {
        if ([params[0] integerValue]==0) {
- (void)webviewScreenCapture:(NSArray *)params {
    if (params.count > 0 && params[0] != [NSNull null]) {
        if ([params[0] integerValue] == 0) {
            base64 = NO;
        }else{
        } else {
            base64 = YES;
        }
    }else{
    } else {
        base64 = NO;
    }
    UIImage *image = [self screenWebviewShot];
    NSString* path = [IPUUtility createDirInDocument:@"images" withFileName:nil withPathExtension:@"jpg"];
    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]];
    }else{
    } else {
        [self callback:path];
    }
}
#pragma mark - 内部调用方法
/*
 全屏截图
 */
- (UIImage *)screenFullShot {
    UIViewController *vc = [self getViewController];
    UIGraphicsBeginImageContextWithOptions(CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT), NO, 0.0);
@@ -126,9 +115,7 @@
    UIGraphicsEndImageContext();
    return screenShotImage;
}
/*
 无状态栏截图
 */
- (UIImage *)screenNoStatusShot {
    IPUMobileWebView *webview = [self getWebView];
    UIGraphicsBeginImageContextWithOptions(CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT), NO, 0.0);
@@ -137,12 +124,8 @@
    UIGraphicsEndImageContext();
    return screenShotImage;
}
/*
 *  获取当前加载的网页的截图
 *  获取当前WebView的size,然后一屏一屏的截图后，再拼接成一张完整的图片
 */
- (UIImage *)screenWebviewShot
{
- (UIImage *)screenWebviewShot {
    IPUMobileWebView *webview = [self getWebView];
    // 1.获取WebView的宽高
    CGSize boundsSize = webview.bounds.size;
@@ -193,44 +176,43 @@
    UIGraphicsEndImageContext();
    return fullImage;
}
#pragma mark - base64类型图片数据
-(NSString*) base64EncodingWithPath:(NSString*) filePath{
    UIImage* image = [UIImage imageWithContentsOfFile:filePath];
- (NSString *)base64EncodingWithPath:(NSString *)filePath {
    UIImage *image = [UIImage imageWithContentsOfFile:filePath];
    if (image) {
        NSData* data =  UIImageJPEGRepresentation(image, 1.0);
        NSData *data =  UIImageJPEGRepresentation(image, 1.0);
        NSString *base64 = [data base64EncodedStringWithOptions:0];
        return base64;
    }
    return nil;
}
-(NSString*) base64EncodingWithData:(NSData*) data{
- (NSString *)base64EncodingWithData:(NSData *)data {
    if (data) {
        NSString *base64 = [data base64EncodedStringWithOptions:0];
        return base64;
    }
    return nil;
}
#pragma mark - 手动截图（内部调用）
/*
 手动截图
 */
-(void)addPanGesture{
- (void)addPanGesture {
    UIViewController *vc = [self getViewController];
    self.clipLeftView.frame = vc.view.frame;
    UIPanGestureRecognizer *pan = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(pan:)];
    [vc.view addGestureRecognizer:pan];
}
- (void)pan:(UIPanGestureRecognizer *)pan
{
- (void)pan:(UIPanGestureRecognizer *)pan {
    UIViewController *vc = [self getViewController];
    CGPoint endPoint = CGPointZero;
    if (pan.state == UIGestureRecognizerStateBegan)
    {
    if (pan.state == UIGestureRecognizerStateBegan) {
        /**开始点击时，记录手势的起点**/
        self.startPoint = [pan locationInView:vc.view];
    }
    else if(pan.state == UIGestureRecognizerStateChanged)
    {
    } else if(pan.state == UIGestureRecognizerStateChanged) {
        /**当手势移动时，动态改变终点的值，并计算起点与终点之间的矩形区域**/
        endPoint = [pan locationInView:vc.view];
        //计算矩形区域的宽高
@@ -244,9 +226,7 @@
        self.clipRightView.frame = CGRectMake(self.clipView.right, self.startPoint.y, SCREEN_WIDTH-self.clipView.right, self.clipView.height);
        self.clipTopView.frame = CGRectMake(0, 0, SCREEN_WIDTH, self.clipView.top);
        self.clipBottomView.frame = CGRectMake(0, self.clipView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT-self.clipView.bottom);
    }
    else if(pan.state == UIGestureRecognizerStateEnded)
    {
    } else if(pan.state == UIGestureRecognizerStateEnded) {
        UIViewController *vc = [self getViewController];
        UIGraphicsBeginImageContextWithOptions(CGSizeMake(SCREEN_WIDTH, SCREEN_HEIGHT), NO, 0.0);
        [vc.view.layer renderInContext:UIGraphicsGetCurrentContext()];
@@ -282,8 +262,9 @@
        [vc.view removeGestureRecognizer:pan];
    }
}
-(UIView *)clipView{
    if (_clipView==nil) {
- (UIView *)clipView {
    if (_clipView == nil) {
        UIView *view = [[UIView alloc] init];
        _clipView = view;
        UIViewController *vc = [self getViewController];
@@ -291,8 +272,9 @@
    }
    return _clipView;
}
-(UIView *)clipLeftView{
    if (_clipLeftView==nil) {
- (UIView *)clipLeftView {
    if (_clipLeftView == nil) {
        UIView *view = [[UIView alloc] init];
        _clipLeftView = view;
        view.backgroundColor = [UIColor blackColor];
@@ -303,8 +285,8 @@
    return _clipLeftView;
}
-(UIView *)clipRightView{
    if (_clipRightView==nil) {
- (UIView *)clipRightView {
    if (_clipRightView == nil) {
        UIView *view = [[UIView alloc] init];
        _clipRightView = view;
        view.backgroundColor = [UIColor blackColor];
@@ -315,8 +297,8 @@
    return _clipRightView;
}
-(UIView *)clipTopView{
    if (_clipTopView==nil) {
- (UIView *)clipTopView {
    if (_clipTopView == nil) {
        UIView *view = [[UIView alloc] init];
        _clipTopView = view;
        view.backgroundColor = [UIColor blackColor];

IPUMobileFunc/IPUMobileFunc/Implementation/IPUBasicUtil.m

@@ -182,7 +182,7 @@
    }
    
    if ([@"UUID" isEqualToString:key]) {
        return [self getUUIDString];
        return dev.identifierForVendor.UUIDString;
    }
    
    if ([@"SDKVERSION" isEqualToString:key]) {
@@ -193,6 +193,10 @@
        return dev.name;
    }
    
    if ([@"IPU_IMEI" isEqualToString:key]) {
        return [self getUUIDString];
    }
    
    return nil;
}

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

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <config name="request_host" value="http://192.168.1.170:8070"/>
    <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"/>-->

display-center/display-center/Info.plist

@@ -207,12 +207,10 @@
	<key>UISupportedInterfaceOrientations</key>
	<array>
		<string>UIInterfaceOrientationPortrait</string>
		<string>UIInterfaceOrientationLandscapeLeft</string>
		<string>UIInterfaceOrientationLandscapeRight</string>
	</array>
	<key>UIViewControllerBasedStatusBarAppearance</key>
	<true/>
	<key>UIUserInterfaceStyle</key>
	<string>Light</string>
	<key>UIViewControllerBasedStatusBarAppearance</key>
	<true/>
</dict>
</plist>

display-center/display-center/ViewController.m

@@ -27,10 +27,7 @@
- (void)viewDidLoad {
    [super viewDidLoad];
    
    //    //添加动态插码：
    //    [IpuProxy setupProxys];
    
    IpuSuspendButton *button = [IpuSuspendButton sharedButton];
    self.button = button;
    [[UIApplication sharedApplication].delegate.window addSubview:button];
@@ -57,6 +54,7 @@
    });
}
- (void)back {
    UIViewController *viewController = [IPUUITool getCurrentViewController];
    
@@ -145,4 +143,5 @@
    return YES;
}
@end