tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

iOS: support devkit change port

Browse Source
This commit is contained in:
pengfei.zhou 2023-08-11 17:30:32 +08:00 committed by jingpeng
parent e638c29ac3
commit 2e7fe08764
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doric-iOS/Devkit/Classes/DoricDevViewController.m
View File

@ -322,8 +322,14 @@ - (void)input {
style:UIAlertActionStyleDefault style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) { handler:^(UIAlertAction *action) {
__strong typeof(_alert) alert = _alert; __strong typeof(_alert) alert = _alert;
NSString *ip = alert.textFields.lastObject.text; NSString *url = alert.textFields.lastObject.text;
[[DoricDev instance] connectDevKit:[NSString stringWithFormat:@"ws://%@:7777", ip]]; if (![url containsString:@":"]) {
url = [NSString stringWithFormat:@"%@:7777", url];
}
if (![url containsString:@"://"]) {
url = [NSString stringWithFormat:@"ws://%@", url];
}
[[DoricDev instance] connectDevKit:url];
}]; }];
[alert addAction:okAction]; [alert addAction:okAction];

14
doric-iOS/Devkit/Classes/QRScanViewController.m
View File

@ -101,10 +101,16 @@ - (void)captureOutput:(AVCaptureOutput *)captureOutput didOutputMetadataObjects:
[self.session stopRunning]; [self.session stopRunning];
if ([metadataObjects count] >= 1) { if ([metadataObjects count] >= 1) {
AVMetadataMachineReadableCodeObject *qrObject = [metadataObjects lastObject]; AVMetadataMachineReadableCodeObject *qrObject = [metadataObjects lastObject];
NSString *result = qrObject.stringValue; NSString *url = qrObject.stringValue;
NSLog(@"Scan result is %@", result); NSLog(@"Scan result is %@", url);
[[DoricDev instance] connectDevKit:[NSString stringWithFormat:@"ws://%@:7777", result]]; if (![url containsString:@":"]) {
ShowToast([NSString stringWithFormat:@"Connected to %@", result], DoricGravityBottom); url = [NSString stringWithFormat:@"%@:7777", url];
}
if (![url containsString:@"://"]) {
url = [NSString stringWithFormat:@"ws://%@", url];
}
[[DoricDev instance] connectDevKit:url];
ShowToast([NSString stringWithFormat:@"Connected to %@", url], DoricGravityBottom);
[self.navigationController popViewControllerAnimated:NO]; [self.navigationController popViewControllerAnimated:NO];
} }
} }