feat(utils): work openFile in simulator (#8495)

* feat: open file in iOS simulator

* feat: added isRealDevice util

* feat: have in mind isRealDevice in utils.openFile

refactor to avoid some circular dependencies

Co-authored-by: Vasil Trifonov <v.trifonov@gmail.com>
This commit is contained in:
tarunama
2020-04-04 01:44:47 +09:00
committed by GitHub
parent 50eb372929
commit bd9828a036
10 changed files with 87 additions and 43 deletions

View File

@ -1947,7 +1947,7 @@ export class Span extends ViewBase {
public textDecoration: TextDecoration;
//@endprivate
}
}
// @public
export class StackLayout extends LayoutBase {
@ -2428,8 +2428,7 @@ export interface TapGestureEventData extends GestureEventData {
getPointerCount(): number;
getX(): number;
getY(): number;
}
}
// @public
export interface Template {
@ -2623,6 +2622,7 @@ export const Utils: {
getModuleName: typeof getModuleName;
openFile: typeof openFile;
openUrl: typeof openUrl;
isRealDevice: typeof isRealDevice;
layout: typeof layout;
android: typeof ad;
ios: typeof ios;
@ -3116,9 +3116,10 @@ export class XmlParser {
// nativescript-core/index.d.ts:114:5 - (ae-forgotten-export) The symbol "getModuleName" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:115:5 - (ae-forgotten-export) The symbol "openFile" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:116:5 - (ae-forgotten-export) The symbol "openUrl" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:117:5 - (ae-forgotten-export) The symbol "layout" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:118:5 - (ae-forgotten-export) The symbol "ad" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:119:5 - (ae-forgotten-export) The symbol "ios" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:117:5 - (ae-forgotten-export) The symbol "isRealDevice" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:118:5 - (ae-forgotten-export) The symbol "layout" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:119:5 - (ae-forgotten-export) The symbol "ad" needs to be exported by the entry point index.d.ts
// nativescript-core/index.d.ts:120:5 - (ae-forgotten-export) The symbol "ios" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:179:26 - (ae-forgotten-export) The symbol "Property" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:179:26 - (ae-forgotten-export) The symbol "CssProperty" needs to be exported by the entry point index.d.ts
// nativescript-core/ui/core/view-base/view-base.d.ts:179:26 - (ae-forgotten-export) The symbol "CssAnimationProperty" needs to be exported by the entry point index.d.ts

View File

@ -100,7 +100,7 @@ export declare const Trace: {
isEnabled: typeof isEnabled;
};
export * from "./ui";
import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject, getModuleName, openFile, openUrl, layout, ad as androidUtils, ios as iosUtils } from "./utils/utils";
import { GC, isFontIconURI, isDataURI, isFileOrResourcePath, executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject, getModuleName, openFile, openUrl, isRealDevice, layout, ad as androidUtils, ios as iosUtils } from "./utils/utils";
export declare const Utils: {
GC: typeof GC;
isFontIconURI: typeof isFontIconURI;
@ -114,6 +114,7 @@ export declare const Utils: {
getModuleName: typeof getModuleName;
openFile: typeof openFile;
openUrl: typeof openUrl;
isRealDevice: typeof isRealDevice;
layout: typeof layout;
android: typeof androidUtils;
ios: typeof iosUtils;

View File

@ -98,7 +98,7 @@ import {
GC, isFontIconURI, isDataURI, isFileOrResourcePath,
executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject,
getModuleName,
openFile, openUrl,
openFile, openUrl, isRealDevice,
layout, ad as androidUtils, ios as iosUtils
} from "./utils/utils";
@ -107,7 +107,7 @@ export const Utils = {
executeOnMainThread, mainThreadify, isMainThread, dispatchToMainThread, releaseNativeObject,
getModuleName,
openFile, openUrl,
openFile, openUrl, isRealDevice,
layout, android: androidUtils, ios: iosUtils
};

View File

@ -137,7 +137,7 @@
/**
* Provides gesture event data.
*/
export interface TapGestureEventData extends GestureEventData {
export interface TapGestureEventData extends GestureEventData {
/**
* Gets the number of pointers in the event.
*/
@ -326,4 +326,3 @@
* @param type - A string representation of a gesture type (e.g. Tap).
*/
export function fromString(type: string): GestureTypes;

View File

@ -153,4 +153,10 @@ export module ad {
return result;
}
}
export function isRealDevice(): boolean {
const fingerprint = android.os.Build.FINGERPRINT;
return fingerprint != null && (fingerprint.indexOf("vbox") > -1 || fingerprint.indexOf("generic") > -1);
}
}

View File

@ -83,6 +83,11 @@ export module ad {
*/
export function getPaletteColor(name: string, context: any /* android.content.Context */): number;
}
/**
* Checks whether the application is running on real device and not on emulator.
*/
export function isRealDevice(): boolean;
}
/**
* Module with ios specific utilities.
@ -165,4 +170,9 @@ export module ios {
export function applyRotateTransform(transform: any /* CATransform3D*/, x: number, y: number, z: number): any /* CATransform3D*/;
export class UIDocumentInteractionControllerDelegateImpl { }
/**
* Checks whether the application is running on real device and not on simulator.
*/
export function isRealDevice(): boolean;
}

View File

@ -4,6 +4,8 @@ import {
write as traceWrite
} from "../trace";
declare var UIImagePickerControllerSourceType: any;
const radToDeg = Math.PI / 180;
function isOrientationLandscape(orientation: number) {
@ -14,7 +16,7 @@ function isOrientationLandscape(orientation: number) {
function openFileAtRootModule(filePath: string): boolean {
try {
const appPath = ios.getCurrentAppPath();
const path = filePath.replace("~", appPath);
let path = ios.isRealDevice() ? filePath.replace("~", appPath) : filePath;
const controller = UIDocumentInteractionController.interactionControllerWithURL(NSURL.fileURLWithPath(path));
controller.delegate = new ios.UIDocumentInteractionControllerDelegateImpl();
@ -153,4 +155,16 @@ export module ios {
return this.getViewController().view.frame;
}
}
export function isRealDevice() {
try {
// https://stackoverflow.com/a/5093092/4936697
const sourceType = UIImagePickerControllerSourceType.UIImagePickerControllerSourceTypeCamera;
const mediaTypes = UIImagePickerController.availableMediaTypesForSourceType(sourceType);
return mediaTypes;
} catch (e) {
return true;
}
}
}

View File

@ -182,3 +182,7 @@ Please ensure you have your manifest correctly configured with the FileProvider.
return false;
}
}
export function isRealDevice(): boolean {
return ad.isRealDevice();
}

View File

@ -347,3 +347,8 @@ export function hasDuplicates(arr: Array<any>): boolean;
* @param arr - The array.
*/
export function eliminateDuplicates(arr: Array<any>): Array<any>;
/**
* Checks whether the application is running on real device and not on simulator/emulator.
*/
export function isRealDevice(): boolean;

View File

@ -9,7 +9,7 @@ export * from "./utils-common";
export function openFile(filePath: string): boolean {
try {
const appPath = ios.getCurrentAppPath();
const path = filePath.replace("~", appPath);
let path = ios.isRealDevice() ? filePath.replace("~", appPath) : filePath;
const controller = UIDocumentInteractionController.interactionControllerWithURL(NSURL.fileURLWithPath(path));
controller.delegate = <UIDocumentInteractionControllerDelegate>new ios.UIDocumentInteractionControllerDelegateImpl();
@ -45,3 +45,7 @@ export function openUrl(location: string): boolean {
return false;
}
export function isRealDevice(): boolean {
return ios.isRealDevice();
}