code refactor

doric-iOS/Devkit/Classes/DoricDev.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+//  DoricDev.h
+//  Doric
+//
+//  Created by jingpeng.wang on 2020/2/25.
+//
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DoricDev : NSObject
++ (instancetype)instance;
+
+- (void)connectDevKit:(NSString *)url;
+
+- (void)disconnectDevKit;
+@end
+
+NS_ASSUME_NONNULL_END

doric-iOS/Devkit/Classes/DoricDev.m

@@ -0,0 +1,61 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+//  DoricDev.m
+//  Doric
+//
+//  Created by jingpeng.wang on 2020/2/25.
+//
+
+#import "DoricDev.h"
+#import "DoricWSClient.h"
+
+@interface DoricDev ()
+@property(nonatomic, strong) DoricWSClient *wsclient;
+@end
+
+@implementation DoricDev
+
+- (instancetype)init {
+    if (self = [super init]) {
+    }
+    return self;
+}
+
++ (instancetype)instance {
+    static DoricDev *_instance;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        _instance = [[DoricDev alloc] init];
+    });
+    return _instance;
+}
+
+- (void)connectDevKit:(NSString *)url {
+    if (self.wsclient) {
+        [self.wsclient close];
+    }
+    self.wsclient = [[DoricWSClient alloc] initWithUrl:url];
+}
+
+- (void)disconnectDevKit {
+    if (self.wsclient) {
+        [self.wsclient close];
+        self.wsclient = nil;
+    }
+}
+
+@end

doric-iOS/Devkit/Classes/DoricWSClient.h

@@ -0,0 +1,33 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+//  WSClient.h
+//  Doric
+//
+//  Created by pengfei.zhou on 2019/8/14.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DoricWSClient : NSObject
+- (instancetype)initWithUrl:(NSString *)url;
+
+- (void)close;
+@end
+
+NS_ASSUME_NONNULL_END

doric-iOS/Devkit/Classes/DoricWSClient.m

@@ -0,0 +1,81 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+//  WSClient.m
+//  Doric
+//
+//  Created by pengfei.zhou on 2019/8/14.
+//
+
+#import "DoricWSClient.h"
+#import <SocketRocket/SRWebSocket.h>
+#import "DoricUtil.h"
+#import "DoricContextManager.h"
+
+@interface DoricWSClient () <SRWebSocketDelegate>
+@property(nonatomic, strong) SRWebSocket *websocket;
+@end
+
+@implementation DoricWSClient
+- (instancetype)initWithUrl:(NSString *)url {
+    if (self = [super init]) {
+        _websocket = [[SRWebSocket alloc] initWithURL:[NSURL URLWithString:url]];
+        _websocket.delegate = self;
+        [_websocket open];
+    }
+    return self;
+}
+
+- (void)webSocketDidOpen:(SRWebSocket *)webSocket {
+    DoricLog(@"webSocketDidOpen");
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload {
+    DoricLog(@"webSocketdidReceivePong");
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message {
+    NSData *jsonData = [message dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *err;
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
+                                                        options:NSJSONReadingMutableContainers
+                                                          error:&err];
+    if (err) {
+        DoricLog(@"webSocketdidReceiveMessage parse error：%@", err);
+        return;
+    }
+    NSString *source = [[dic valueForKey:@"source"] mutableCopy];
+    NSString *script = [dic valueForKey:@"script"];
+    for (NSValue *value in  [[DoricContextManager instance] aliveContexts]) {
+        DoricContext *context = value.nonretainedObjectValue;
+        if ([source containsString:context.source]) {
+            [context reload:script];
+        }
+    }
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error {
+    DoricLog(@"webSocketdidFailWithError");
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean {
+    DoricLog(@"webSocketdidCloseWithCode");
+}
+
+- (void)close {
+    [self.websocket close];
+}
+@end

doric-iOS/Devkit/Classes/QRScanViewController.h

@@ -0,0 +1,28 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+//  QRScanViewController.h
+//  Doric
+//
+//  Created by jingpeng.wang on 2020/2/25.
+//
+
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface QRScanViewController : UIViewController
+@end

doric-iOS/Devkit/Classes/QRScanViewController.m

@@ -0,0 +1,111 @@
+/*
+ * Copyright [2019] [Doric.Pub]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+//
+//  QRScanViewController.m
+//  Doric
+//
+//  Created by jingpeng.wang on 2020/2/25.
+//
+
+#import "QRScanViewController.h"
+#import <AVFoundation/AVFoundation.h>
+#import <DoricCore/Doric.h>
+#import <DoricDevkit/DoricDev.h>
+
+@interface QRScanViewController () <AVCaptureMetadataOutputObjectsDelegate>
+@property(strong, nonatomic) AVCaptureDevice *device;
+@property(strong, nonatomic) AVCaptureDeviceInput *input;
+@property(strong, nonatomic) AVCaptureMetadataOutput *output;
+@property(strong, nonatomic) AVCaptureSession *session;
+@property(strong, nonatomic) AVCaptureVideoPreviewLayer *previewLayer;
+@property(strong, nonatomic) UIPinchGestureRecognizer *pinchGes;
+@property(assign, nonatomic) CGFloat scanRegion_W;
+@property(assign, nonatomic) CGFloat initScale;
+@end
+
+@implementation QRScanViewController
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"扫一扫";
+    [self configBasicDevice];
+    [self configPinchGes];
+    [self.session startRunning];
+}
+
+- (void)configBasicDevice {
+    self.device = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+    self.input = [[AVCaptureDeviceInput alloc] initWithDevice:self.device error:nil];
+    self.output = [[AVCaptureMetadataOutput alloc] init];
+    [self.output setMetadataObjectsDelegate:self queue:dispatch_get_main_queue()];
+    self.session = [[AVCaptureSession alloc] init];
+    [self.session setSessionPreset:AVCaptureSessionPresetHigh];
+    if ([self.session canAddInput:self.input]) {
+        [self.session addInput:self.input];
+    }
+    if ([self.session canAddOutput:self.output]) {
+        [self.session addOutput:self.output];
+    }
+    [self.output setMetadataObjectTypes:@[AVMetadataObjectTypeQRCode]];
+    [self.output setRectOfInterest:CGRectMake(0, 0, 1, 1)];
+    self.previewLayer = [[AVCaptureVideoPreviewLayer alloc] initWithSession:self.session];
+    self.previewLayer.frame = CGRectMake(0, 0, self.view.width, self.view.height);
+    self.previewLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
+    [self.view.layer addSublayer:self.previewLayer];
+}
+
+- (void)configPinchGes {
+    self.pinchGes = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(pinchDetected:)];
+    [self.view addGestureRecognizer:self.pinchGes];
+}
+
+- (void)pinchDetected:(UIPinchGestureRecognizer *)recogniser {
+    if (!_device) {
+        return;
+    }
+    if (recogniser.state == UIGestureRecognizerStateBegan) {
+        _initScale = _device.videoZoomFactor;
+    }
+    NSError *error = nil;
+    [_device lockForConfiguration:&error];
+    if (!error) {
+        CGFloat zoomFactor;
+        CGFloat scale = recogniser.scale;
+        if (scale < 1.0f) {
+            zoomFactor = self.initScale - pow(self.device.activeFormat.videoMaxZoomFactor, 1.0f - recogniser.scale);
+        } else {
+            zoomFactor = self.initScale + pow(self.device.activeFormat.videoMaxZoomFactor, (recogniser.scale - 1.0f) / 2.0f);
+        }
+        zoomFactor = MIN(15.0f, zoomFactor);
+        zoomFactor = MAX(1.0f, zoomFactor);
+        _device.videoZoomFactor = zoomFactor;
+        [_device unlockForConfiguration];
+    }
+}
+
+#pragma mark - AVCaptureMetadataOutputObjectsDelegate
+
+- (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:(NSArray *)metadataObjects fromConnection:(AVCaptureConnection *)connection {
+    [self.session stopRunning];
+    if ([metadataObjects count] >= 1) {
+        AVMetadataMachineReadableCodeObject *qrObject = [metadataObjects lastObject];
+        NSString *result = qrObject.stringValue;
+        NSLog(@"Scan result is %@", result);
+        [[DoricDev instance] connectDevKit:[NSString stringWithFormat:@"ws://%@:7777", result]];
+        ShowToast([NSString stringWithFormat:@"Connected to %@", result], BOTTOM);
+        [self.navigationController popViewControllerAnimated:NO];
+    }
+}
+@end