|
|
@ -19,29 +19,30 @@ import { |
|
|
ElementRef, |
|
|
ElementRef, |
|
|
Inject, |
|
|
Inject, |
|
|
Input, |
|
|
Input, |
|
|
NgZone, |
|
|
|
|
|
OnDestroy, |
|
|
OnDestroy, |
|
|
OnInit, |
|
|
OnInit, |
|
|
ViewChild, |
|
|
ViewChild, |
|
|
ViewEncapsulation |
|
|
ViewEncapsulation |
|
|
} from '@angular/core'; |
|
|
} from '@angular/core'; |
|
|
import { PageComponent } from '@shared/components/page.component'; |
|
|
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; |
|
|
import { WidgetContext } from '@home/models/widget-component.models'; |
|
|
import { ImageService } from '@app/core/public-api'; |
|
|
import { Store } from '@ngrx/store'; |
|
|
|
|
|
import { AppState } from '@core/core.state'; |
|
|
import { AppState } from '@core/core.state'; |
|
|
import { Overlay } from '@angular/cdk/overlay'; |
|
|
import { AttributeService } from '@core/http/attribute.service'; |
|
|
import { UtilsService } from '@core/services/utils.service'; |
|
|
import { UtilsService } from '@core/services/utils.service'; |
|
|
import { Datasource, DatasourceData, DatasourceType } from '@shared/models/widget.models'; |
|
|
|
|
|
import { WINDOW } from '@core/services/window.service'; |
|
|
import { WINDOW } from '@core/services/window.service'; |
|
|
import { AttributeService } from '@core/http/attribute.service'; |
|
|
import { isString } from '@core/utils'; |
|
|
|
|
|
import { WidgetContext } from '@home/models/widget-component.models'; |
|
|
|
|
|
import { Store } from '@ngrx/store'; |
|
|
|
|
|
import { PageComponent } from '@shared/components/page.component'; |
|
|
import { EntityId } from '@shared/models/id/entity-id'; |
|
|
import { EntityId } from '@shared/models/id/entity-id'; |
|
|
import { AttributeScope, DataKeyType } from '@shared/models/telemetry/telemetry.models'; |
|
|
import { AttributeScope, DataKeyType } from '@shared/models/telemetry/telemetry.models'; |
|
|
import { Observable } from 'rxjs'; |
|
|
import { Datasource, DatasourceData, DatasourceType } from '@shared/models/widget.models'; |
|
|
import { isString } from '@core/utils'; |
|
|
import { map, Observable, of, switchMap } from 'rxjs'; |
|
|
import { DomSanitizer, SafeUrl } from '@angular/platform-browser'; |
|
|
|
|
|
|
|
|
|
|
|
interface PhotoCameraInputWidgetSettings { |
|
|
interface PhotoCameraInputWidgetSettings { |
|
|
widgetTitle: string; |
|
|
widgetTitle: string; |
|
|
|
|
|
saveToGallery: boolean; |
|
|
|
|
|
usePublicGalleryLink: boolean; |
|
|
imageQuality: number; |
|
|
imageQuality: number; |
|
|
imageFormat: string; |
|
|
imageFormat: string; |
|
|
maxWidth: number; |
|
|
maxWidth: number; |
|
|
@ -59,9 +60,7 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On |
|
|
|
|
|
|
|
|
constructor(@Inject(WINDOW) private window: Window, |
|
|
constructor(@Inject(WINDOW) private window: Window, |
|
|
protected store: Store<AppState>, |
|
|
protected store: Store<AppState>, |
|
|
private elementRef: ElementRef, |
|
|
private imageService: ImageService, |
|
|
private ngZone: NgZone, |
|
|
|
|
|
private overlay: Overlay, |
|
|
|
|
|
private utils: UtilsService, |
|
|
private utils: UtilsService, |
|
|
private attributeService: AttributeService, |
|
|
private attributeService: AttributeService, |
|
|
private sanitizer: DomSanitizer |
|
|
private sanitizer: DomSanitizer |
|
|
@ -119,6 +118,9 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On |
|
|
lastPhoto: SafeUrl; |
|
|
lastPhoto: SafeUrl; |
|
|
datasourceDetected = false; |
|
|
datasourceDetected = false; |
|
|
|
|
|
|
|
|
|
|
|
private mimeType: string; |
|
|
|
|
|
private quality: number; |
|
|
|
|
|
|
|
|
private static hasGetUserMedia(): boolean { |
|
|
private static hasGetUserMedia(): boolean { |
|
|
return !!(window.navigator.mediaDevices && window.navigator.mediaDevices.getUserMedia); |
|
|
return !!(window.navigator.mediaDevices && window.navigator.mediaDevices.getUserMedia); |
|
|
} |
|
|
} |
|
|
@ -160,6 +162,9 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On |
|
|
this.dataKeyDetected = true; |
|
|
this.dataKeyDetected = true; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
this.mimeType = this.settings.imageFormat || PhotoCameraInputWidgetComponent.DEFAULT_IMAGE_TYPE; |
|
|
|
|
|
this.quality = this.settings.imageQuality || PhotoCameraInputWidgetComponent.DEFAULT_IMAGE_QUALITY; |
|
|
|
|
|
|
|
|
this.detectAvailableDevices(); |
|
|
this.detectAvailableDevices(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -169,8 +174,8 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On |
|
|
|
|
|
|
|
|
private updateWidgetData(data: Array<DatasourceData>) { |
|
|
private updateWidgetData(data: Array<DatasourceData>) { |
|
|
const keyData = data[0].data; |
|
|
const keyData = data[0].data; |
|
|
if (keyData?.length && isString(keyData[0][1]) && keyData[0][1].startsWith('data:image/')) { |
|
|
if (keyData?.length && isString(keyData[0][1])) { |
|
|
this.lastPhoto = this.sanitizer.bypassSecurityTrustUrl(keyData[0][1]); |
|
|
this.lastPhoto = keyData[0][1].startsWith('data:image/') ? this.sanitizer.bypassSecurityTrustUrl(keyData[0][1]) : keyData[0][1]; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -237,26 +242,34 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On |
|
|
|
|
|
|
|
|
savePhoto() { |
|
|
savePhoto() { |
|
|
this.updatePhoto = true; |
|
|
this.updatePhoto = true; |
|
|
let task: Observable<any>; |
|
|
|
|
|
const entityId: EntityId = { |
|
|
const entityId: EntityId = { |
|
|
entityType: this.datasource.entityType, |
|
|
entityType: this.datasource.entityType, |
|
|
id: this.datasource.entityId |
|
|
id: this.datasource.entityId |
|
|
}; |
|
|
}; |
|
|
const saveData = [{ |
|
|
|
|
|
key: this.datasource.dataKeys[0].name, |
|
|
const uploadImage$ = this.settings.saveToGallery ? this.saveImageToGallery() : of(this.previewPhoto); |
|
|
value: this.previewPhoto |
|
|
|
|
|
}]; |
|
|
uploadImage$.pipe( |
|
|
if (this.datasource.dataKeys[0].type === DataKeyType.attribute) { |
|
|
switchMap((image) => { |
|
|
task = this.attributeService.saveEntityAttributes(entityId, AttributeScope.SERVER_SCOPE, saveData); |
|
|
const saveData = [{ |
|
|
} else if (this.datasource.dataKeys[0].type === DataKeyType.timeseries) { |
|
|
key: this.datasource.dataKeys[0].name, |
|
|
task = this.attributeService.saveEntityTimeseries(entityId, 'scope', saveData); |
|
|
value: image |
|
|
} |
|
|
}]; |
|
|
task.subscribe(() => { |
|
|
if (this.datasource.dataKeys[0].type === DataKeyType.attribute) { |
|
|
this.isPreviewPhoto = false; |
|
|
return this.attributeService.saveEntityAttributes(entityId, AttributeScope.SERVER_SCOPE, saveData); |
|
|
this.updatePhoto = false; |
|
|
} else if (this.datasource.dataKeys[0].type === DataKeyType.timeseries) { |
|
|
this.closeCamera(); |
|
|
return this.attributeService.saveEntityTimeseries(entityId, 'scope', saveData); |
|
|
}, () => { |
|
|
} |
|
|
this.updatePhoto = false; |
|
|
}) |
|
|
|
|
|
).subscribe({ |
|
|
|
|
|
next: () => { |
|
|
|
|
|
this.isPreviewPhoto = false; |
|
|
|
|
|
this.updatePhoto = false; |
|
|
|
|
|
this.closeCamera(); |
|
|
|
|
|
}, |
|
|
|
|
|
error: () => { |
|
|
|
|
|
this.updatePhoto = false; |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -271,12 +284,36 @@ export class PhotoCameraInputWidgetComponent extends PageComponent implements On |
|
|
this.canvasElement.height = this.videoHeight; |
|
|
this.canvasElement.height = this.videoHeight; |
|
|
this.canvasElement.getContext('2d').drawImage(this.videoElement, 0, 0, this.videoWidth, this.videoHeight); |
|
|
this.canvasElement.getContext('2d').drawImage(this.videoElement, 0, 0, this.videoWidth, this.videoHeight); |
|
|
|
|
|
|
|
|
const mimeType: string = this.settings.imageFormat ? this.settings.imageFormat : PhotoCameraInputWidgetComponent.DEFAULT_IMAGE_TYPE; |
|
|
this.previewPhoto = this.canvasElement.toDataURL(this.mimeType, this.quality); |
|
|
const quality: number = this.settings.imageQuality ? this.settings.imageQuality : PhotoCameraInputWidgetComponent.DEFAULT_IMAGE_QUALITY; |
|
|
|
|
|
this.previewPhoto = this.canvasElement.toDataURL(mimeType, quality); |
|
|
|
|
|
this.isPreviewPhoto = true; |
|
|
this.isPreviewPhoto = true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private saveImageToGallery(): Observable<string> { |
|
|
|
|
|
return new Observable<Blob>((observer) => { |
|
|
|
|
|
this.canvasElement.toBlob( |
|
|
|
|
|
(blob) => { |
|
|
|
|
|
if (blob) { |
|
|
|
|
|
observer.next(blob); |
|
|
|
|
|
observer.complete(); |
|
|
|
|
|
} else { |
|
|
|
|
|
observer.error('Failed to create image blob'); |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
this.mimeType, |
|
|
|
|
|
this.quality |
|
|
|
|
|
); |
|
|
|
|
|
}).pipe( |
|
|
|
|
|
switchMap((blob) => { |
|
|
|
|
|
const fileName = this.datasource.dataKeys[0].name; |
|
|
|
|
|
const file = new File([blob], fileName, { type: this.mimeType }); |
|
|
|
|
|
return this.imageService.uploadImage(file, fileName); |
|
|
|
|
|
}), |
|
|
|
|
|
map((imageInfo) => |
|
|
|
|
|
this.settings.usePublicGalleryLink ? imageInfo.publicLink : imageInfo.link |
|
|
|
|
|
) |
|
|
|
|
|
); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private inititedVideoStream(deviceId?: string, init = false) { |
|
|
private inititedVideoStream(deviceId?: string, init = false) { |
|
|
if (window.navigator.mediaDevices && window.navigator.mediaDevices.getUserMedia) { |
|
|
if (window.navigator.mediaDevices && window.navigator.mediaDevices.getUserMedia) { |
|
|
const videoTrackConstraints = { |
|
|
const videoTrackConstraints = { |
|
|
|
Igor Kulikov
9 months ago
GitHub