javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): application.displayedEvent does not depend on trace to fire (#7141) (#7156)

Browse Source
This commit is contained in:
Manol Donev
2019-04-17 13:57:22 +03:00
committed by GitHub
parent f0146f0e1b
commit 4e56c89f7d
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/app/app/app.ts
View File

@ -8,24 +8,6 @@ else {
import * as application from "tns-core-modules/application"; import * as application from "tns-core-modules/application";
// Specify custom UIApplicationDelegate.
/*
class MyDelegate extends UIResponder implements UIApplicationDelegate {
public static ObjCProtocols = [UIApplicationDelegate];
applicationDidFinishLaunchingWithOptions(application: UIApplication, launchOptions: NSDictionary): boolean {
console.log("applicationWillFinishLaunchingWithOptions: " + launchOptions)
return true;
}
applicationDidBecomeActive(application: UIApplication): void {
console.log("applicationDidBecomeActive: " + application)
}
}
application.ios.delegate = MyDelegate;
*/
if (application.ios) { if (application.ios) {
// Observe application notifications. // Observe application notifications.
application.ios.addNotificationObserver(UIApplicationDidFinishLaunchingNotification, (notification: NSNotification) => { application.ios.addNotificationObserver(UIApplicationDidFinishLaunchingNotification, (notification: NSNotification) => {
@ -34,6 +16,18 @@ if (application.ios) {
} }
// Common events for both Android and iOS. // Common events for both Android and iOS.
application.on(application.displayedEvent, function (args: application.ApplicationEventData) {
(<any>global).isDisplayedEventFired = true;
if (args.android) {
// For Android applications, args.android is an android activity class.
console.log("Activity: " + args.android);
} else if (args.ios) {
// For iOS applications, args.ios is UIApplication.
console.log("UIApplication: " + args.ios);
}
});
application.on(application.launchEvent, function (args: application.ApplicationEventData) { application.on(application.launchEvent, function (args: application.ApplicationEventData) {
if (args.android) { if (args.android) {
// For Android applications, args.android is an android.content.Intent class. // For Android applications, args.android is an android.content.Intent class.

7
tests/app/application/application-tests-common.ts
View File

@ -13,7 +13,7 @@ if (app.android) {
import * as TKUnit from "../TKUnit"; import * as TKUnit from "../TKUnit";
export var testInitialized = function () { export function testInitialized() {
if (platform.device.os === platform.platformNames.android) { if (platform.device.os === platform.platformNames.android) {
// we have the android defined // we have the android defined
TKUnit.assert(app.android, "Application module not properly intialized"); TKUnit.assert(app.android, "Application module not properly intialized");
@ -21,3 +21,8 @@ export var testInitialized = function () {
TKUnit.assert(app.ios, "Application module not properly intialized"); TKUnit.assert(app.ios, "Application module not properly intialized");
} }
} }
export function testDisplayedEvent() {
// global.isDisplayedEventFired flag is set in app.ts application.displayedEvent handler
TKUnit.assert((<any>global).isDisplayedEventFired, "application.displayedEvent not fired");
}

4
tns-core-modules/application/application.ios.ts
View File

@ -19,7 +19,7 @@ import { createViewFromEntry } from "../ui/builder";
import { ios as iosView, View } from "../ui/core/view"; import { ios as iosView, View } from "../ui/core/view";
import { Frame, NavigationEntry } from "../ui/frame"; import { Frame, NavigationEntry } from "../ui/frame";
import { ios } from "../utils/utils"; import { ios } from "../utils/utils";
import { profile, level as profilingLevel, Level } from "../profiling"; import { profile } from "../profiling";
const getVisibleViewController = ios.getVisibleViewController; const getVisibleViewController = ios.getVisibleViewController;
@ -133,7 +133,7 @@ class IOSApplication implements IOSApplicationDefinition {
@profile @profile
private didFinishLaunchingWithOptions(notification: NSNotification) { private didFinishLaunchingWithOptions(notification: NSNotification) {
if (!displayedOnce && profilingLevel() >= Level.lifecycle) { if (!displayedOnce) {
displayedLinkTarget = CADisplayLinkTarget.new(); displayedLinkTarget = CADisplayLinkTarget.new();
displayedLink = CADisplayLink.displayLinkWithTargetSelector(displayedLinkTarget, "onDisplayed"); displayedLink = CADisplayLink.displayLinkWithTargetSelector(displayedLinkTarget, "onDisplayed");
displayedLink.addToRunLoopForMode(NSRunLoop.mainRunLoop, NSDefaultRunLoopMode); displayedLink.addToRunLoopForMode(NSRunLoop.mainRunLoop, NSDefaultRunLoopMode);