@extscreen/es-core 1.1.3 → 1.1.6

package/dist/index.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import { ESLog } from '@extscreen/es-log';
+import { ESApp as ESApp$1 } from '@extscreen/es-core';
 
 /**
  *
@@ -1841,6 +1842,135 @@ class ESLaunchManager {
 
 var ESLaunchManager$1 = new ESLaunchManager();
 
+const TAG$1 = "ESRouter";
+
+function getComponentInstance(route) {
+  if (!route) {
+    return null;
+  }
+  if (route.matched && route.matched.length > 0) {
+    const matched = route.matched[0];
+    if (matched.instances && matched.instances.default) {
+      return matched.instances.default;
+    }
+  }
+  return null;
+}
+
+function dispatchKeyEvent(route, keyEvent) {
+  let instance = getComponentInstance(route);
+  dispatchInstanceKeyEvent(instance, keyEvent);
+}
+
+function dispatchInstanceKeyEvent(componentInstance, keyEvent) {
+  if (componentInstance) {
+    if (isFunction(componentInstance.onDispatchKeyEvent)) {
+      componentInstance.onDispatchKeyEvent(keyEvent);
+    }
+    //
+    else {
+      //
+      if (keyEvent && keyEvent.action === 0) {
+        if (isFunction(componentInstance.onKeyDown)) {
+          if (ESLog.isLoggable(ESLog.DEBUG)) {
+            ESLog.d(TAG$1, '#-------onKeyDown---success------>>>>>');
+          }
+          componentInstance.onKeyDown(keyEvent);
+        } else {
+          if (ESLog.isLoggable(ESLog.DEBUG)) {
+            ESLog.d(TAG$1, '#-------onKeyDown---error------>>>>>');
+          }
+        }
+      }
+      //
+      else if (keyEvent && keyEvent.action === 1) {
+        if (isFunction(componentInstance.onKeyUp)) {
+          if (ESLog.isLoggable(ESLog.DEBUG)) {
+            ESLog.d(TAG$1, '#-------onKeyUp---success------>>>>>');
+          }
+          componentInstance.onKeyUp(keyEvent);
+        } else {
+          if (ESLog.isLoggable(ESLog.DEBUG)) {
+            ESLog.d(TAG$1, '#-------onKeyUp---error------>>>>>');
+          }
+        }
+      }
+    }
+  } else {
+    if (ESLog.isLoggable(ESLog.DEBUG)) {
+      ESLog.d(TAG$1, '#-------dispatchInstanceKeyEvent-----实例对象为空------>>>>>');
+    }
+  }
+}
+
+
+function dispatchBackPressed(route) {
+  let instance = getComponentInstance(route);
+  dispatchInstanceBackPressed(instance);
+}
+
+function dispatchInstanceBackPressed(componentInstance) {
+  if (componentInstance) {
+    if (isFunction(componentInstance.onBackPressed)) {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d(TAG$1, '#-------onBackPressed---success------>>>>>');
+      }
+      componentInstance.onBackPressed();
+    }
+  } else {
+    if (ESLog.isLoggable(ESLog.DEBUG)) {
+      ESLog.d(TAG$1, '#-------dispatchInstanceBackPressed-----实例对象为空------>>>>>');
+    }
+  }
+}
+
+
+function isFunction(func) {
+  return Object.prototype.toString.call(func) === '[object Function]';
+}
+
+const TAG = "ESRouter";
+
+var ESRouter = {
+
+  mounted() {
+    if (ESLaunchManager$1.isESRouterEnabled()) {
+      Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
+      ESApp$1.$on('hardwareBackPress', this.onESRouterBackPressed);
+      ESApp$1.$on('DispatchKeyEvent', this.onESRouterDispatchKeyEvent);
+    }
+  },
+  beforeDestroy() {
+    if (ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp$1.$off('hardwareBackPress', this.onESRouterBackPressed);
+      ESApp$1.$off('DispatchKeyEvent', this.onESRouterDispatchKeyEvent);
+    }
+  },
+
+  methods: {
+    onESRouterBackPressed() {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d(TAG, '#-------onESRouterBackPressed----->>>>>');
+      }
+      let router = this.$router;
+      if (router) {
+        let route = router.currentRoute;
+        dispatchBackPressed(route);
+      }
+    },
+    onESRouterDispatchKeyEvent(keyEvent) {
+      if (ESLog.isLoggable(ESLog.DEBUG)) {
+        ESLog.d(TAG, '#-------onESRouterDispatchKeyEvent----->>>>>' + keyEvent);
+      }
+      let router = this.$router;
+      if (router) {
+        let route = router.currentRoute;
+        dispatchKeyEvent(route, keyEvent);
+      }
+    },
+  },
+};
+
 /**
  *
  */
@@ -2750,8 +2880,26 @@ const AUDIO_USAGE_ASSISTANT = 16;
  */
 
 var ESBackPressMixin = {
+
   mounted() {
-    Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      Vue.Native.callNative('DeviceEventModule', 'setListenBackPress', true);
+      ESApp.$on('hardwareBackPress', this.onESBackPressed);
+    }
+  },
+  beforeDestroy() {
+    if (!ESLaunchManager$1.isESRouterEnabled()) {
+      ESApp.$off('hardwareBackPress', this.onESBackPressed);
+    }
+  },
+
+  methods: {
+    onESBackPressed() {
+      this.onBackPressed();
+    },
+    onBackPressed() {
+
+    },
   },
 };
 
@@ -2777,17 +2925,8 @@ const KEYCODE_SEARCH = 84;
 var ESKeyEventMixin = {
   mounted() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
-      if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d('ESRouter', '----ESKeyEventMixin---监听Activity----->>>>');
-      }
       ESApp.$on('DispatchKeyEvent', this.onDispatchKeyEvent);
     }
-    //
-    else {
-      if (ESLog.isLoggable(ESLog.DEBUG)) {
-        ESLog.d('ESRouter', '----ESKeyEventMixin---监听Fragment----->>>>');
-      }
-    }
   },
   beforeDestroy() {
     if (!ESLaunchManager$1.isESRouterEnabled()) {
@@ -2801,9 +2940,7 @@ var ESKeyEventMixin = {
         ESLog.d('ESRouter', '----ESKeyEventMixin---onDispatchKeyEvent----->>>>' + JSON.stringify(keyEvent));
       }
       if (keyEvent.action === KEY_ACTION_DOWN) {
-        if (keyEvent.keyCode === KEYCODE_BACK || keyEvent.keyCode === KEYCODE_ESCAPE) {
-          this.onBackPressed();
-        } else {
+        if (keyEvent.keyCode === KEYCODE_BACK || keyEvent.keyCode === KEYCODE_ESCAPE) ; else {
           this.onKeyDown(keyEvent);
         }
       }
@@ -2819,9 +2956,6 @@ var ESKeyEventMixin = {
     },
     onKeyUp(keyEvent) {
 
-    },
-    onBackPressed() {
-
     },
   },
 };
@@ -2860,14 +2994,6 @@ var ESLifecycleMixin = {
         this.onESResume();
       }
       //
-      else if (event === 'visibleToUser') {
-        this.onESResume();
-      }
-      //
-      else if (event === 'invisibleToUser') {
-        this.onESPause();
-      }
-      //
       else if (event === 'onPause') {
         this.onESPause();
       }
@@ -2923,4 +3049,4 @@ const ES_FAST_OUT_LINEAR_IN_INTERPOLATOR = 10;
 const ES_FAST_OUT_SLOW_IN_INTERPOLATOR = 11;
 const ES_PATH_INTERPOLATOR = 12;
 
-export { AUDIO_CONTENT_TYPE_MOVIE, AUDIO_CONTENT_TYPE_MUSIC, AUDIO_CONTENT_TYPE_SONIFICATION, AUDIO_CONTENT_TYPE_SPEECH, AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_STREAM_ACCESSIBILITY, AUDIO_STREAM_ALARM, AUDIO_STREAM_ASSISTANT, AUDIO_STREAM_BLUETOOTH_SCO, AUDIO_STREAM_DEFAULT, AUDIO_STREAM_DTMF, AUDIO_STREAM_MUSIC, AUDIO_STREAM_NOTIFICATION, AUDIO_STREAM_RING, AUDIO_STREAM_SYSTEM, AUDIO_STREAM_SYSTEM_ENFORCED, AUDIO_STREAM_TTS, AUDIO_STREAM_VOICE_CALL, AUDIO_USAGE_ALARM, AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY, AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, AUDIO_USAGE_ASSISTANCE_SONIFICATION, AUDIO_USAGE_ASSISTANT, AUDIO_USAGE_GAME, AUDIO_USAGE_INVALID, AUDIO_USAGE_MEDIA, AUDIO_USAGE_NOTIFICATION, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST, AUDIO_USAGE_NOTIFICATION_EVENT, AUDIO_USAGE_NOTIFICATION_RINGTONE, AUDIO_USAGE_UNKNOWN, AUDIO_USAGE_VIRTUAL_SOURCE, AUDIO_USAGE_VOICE_COMMUNICATION, AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING, ES$1 as ES, ESAnimationViewComponent, ESApp, ESAppModule$1 as ESAppModule, ESAudioModule$1 as ESAudioModule, ESBackPressMixin, ESDevelopManager$1 as ESDevelopManager, ESDevelopModule$1 as ESDevelopModule, ESDeviceManager$1 as ESDeviceManager, ESDeviceModule$1 as ESDeviceModule, ESDisplayManager$1 as ESDisplayManager, ESFile, ESFileModule$1 as ESFileModule, ESKeyEventMixin, ESLaunchManager$1 as ESLaunchManager, ESLifecycleMixin, ESLoadingViewComponent, ESMMapManager$1 as ESMMapManager, ESMMapModule$1 as ESMMapModule, ESManager$1 as ESManager, ESModule$1 as ESModule, ESNetworkManager$1 as ESNetworkManager, ESNetworkMixin, ESNetworkModule$1 as ESNetworkModule, ESPageRootViewComponent, ESPageRouterViewComponent, ESPermissionModule$1 as ESPermissionModule, ESPowerModule$1 as ESPowerModule, ESProgressBarViewComponent, ESQRCodeViewComponent, ESScrollViewComponent, ESSeekBarViewComponent, ESSharedPreferencesModule$1 as ESSharedPreferencesModule, ESStorageModule$1 as ESStorageModule, ESTextViewComponent, ESToast$1 as ESToast, ToastModule as ESToastModule, ESTransitionImageViewComponent, ESUsbDeviceMixin, ESUsbDeviceModule$1 as ESUsbDeviceModule, ES_ACCELERATE_DECELERATE_INTERPOLATOR, ES_ACCELERATE_INTERPOLATOR, ES_ANIMATION_PROPERTY_NAME_ALPHA, ES_ANIMATION_PROPERTY_NAME_ROTATION, ES_ANIMATION_PROPERTY_NAME_SCALE_X, ES_ANIMATION_PROPERTY_NAME_SCALE_Y, ES_ANIMATION_PROPERTY_NAME_TRANSLATION_X, ES_ANIMATION_PROPERTY_NAME_TRANSLATION_Y, ES_ANIMATION_REPEAT_MODE_INFINITE, ES_ANIMATION_REPEAT_MODE_RESTART, ES_ANIMATION_REPEAT_MODE_REVERSE, ES_ANIMATION_TYPE_AFTER, ES_ANIMATION_TYPE_AFTER_DELAY, ES_ANIMATION_TYPE_BEFORE, ES_ANIMATION_TYPE_NONE, ES_ANIMATION_TYPE_PLAY, ES_ANIMATION_TYPE_PLAY_SEQUENTIALLY, ES_ANIMATION_TYPE_PLAY_TOGETHER, ES_ANIMATION_TYPE_WITH, ES_ANIMATION_VALUE_TYPE_FLOAT, ES_ANIMATION_VALUE_TYPE_INT, ES_ANTICIPATE_INTERPOLATOR, ES_ANTICIPATE_OVERSHOOT_INTERPOLATOR, ES_BOUNCE_INTERPOLATOR, ES_CYCLE_INTERPOLATOR, ES_DECELERATE_INTERPOLATOR, ES_FAST_OUT_LINEAR_IN_INTERPOLATOR, ES_FAST_OUT_SLOW_IN_INTERPOLATOR, ES_LINEAR_INTERPOLATOR, ES_MMP_MODE_PRIVATE, ES_MMP_MODE_WORLD_READABLE, ES_MMP_MODE_WORLD_WRITEABLE, ES_NETWORK_INFO_STATE_CONNECTED, ES_NETWORK_INFO_STATE_CONNECTING, ES_NETWORK_INFO_STATE_DISCONNECTED, ES_NETWORK_INFO_STATE_DISCONNECTING, ES_NETWORK_INFO_STATE_SUSPENDED, ES_NETWORK_INFO_STATE_UNKNOWN, ES_NETWORK_INFO_TYPE_ETHERNET, ES_NETWORK_INFO_TYPE_MOBILE, ES_NETWORK_INFO_TYPE_NONE, ES_NETWORK_INFO_TYPE_WIFI, ES_OVERSHOOT_INTERPOLATOR, ES_PATH_INTERPOLATOR, KEYCODE_BACK, KEYCODE_DPAD_CENTER, KEYCODE_DPAD_DOWN, KEYCODE_DPAD_LEFT, KEYCODE_DPAD_RIGHT, KEYCODE_DPAD_UP, KEYCODE_ENTER, KEYCODE_ESCAPE, KEYCODE_MENU, KEYCODE_SEARCH, KEY_ACTION_DOWN, KEY_ACTION_UP, getESApp, setESApp };
+export { AUDIO_CONTENT_TYPE_MOVIE, AUDIO_CONTENT_TYPE_MUSIC, AUDIO_CONTENT_TYPE_SONIFICATION, AUDIO_CONTENT_TYPE_SPEECH, AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_STREAM_ACCESSIBILITY, AUDIO_STREAM_ALARM, AUDIO_STREAM_ASSISTANT, AUDIO_STREAM_BLUETOOTH_SCO, AUDIO_STREAM_DEFAULT, AUDIO_STREAM_DTMF, AUDIO_STREAM_MUSIC, AUDIO_STREAM_NOTIFICATION, AUDIO_STREAM_RING, AUDIO_STREAM_SYSTEM, AUDIO_STREAM_SYSTEM_ENFORCED, AUDIO_STREAM_TTS, AUDIO_STREAM_VOICE_CALL, AUDIO_USAGE_ALARM, AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY, AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE, AUDIO_USAGE_ASSISTANCE_SONIFICATION, AUDIO_USAGE_ASSISTANT, AUDIO_USAGE_GAME, AUDIO_USAGE_INVALID, AUDIO_USAGE_MEDIA, AUDIO_USAGE_NOTIFICATION, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT, AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST, AUDIO_USAGE_NOTIFICATION_EVENT, AUDIO_USAGE_NOTIFICATION_RINGTONE, AUDIO_USAGE_UNKNOWN, AUDIO_USAGE_VIRTUAL_SOURCE, AUDIO_USAGE_VOICE_COMMUNICATION, AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING, ES$1 as ES, ESAnimationViewComponent, ESApp, ESAppModule$1 as ESAppModule, ESAudioModule$1 as ESAudioModule, ESBackPressMixin, ESDevelopManager$1 as ESDevelopManager, ESDevelopModule$1 as ESDevelopModule, ESDeviceManager$1 as ESDeviceManager, ESDeviceModule$1 as ESDeviceModule, ESDisplayManager$1 as ESDisplayManager, ESFile, ESFileModule$1 as ESFileModule, ESKeyEventMixin, ESLaunchManager$1 as ESLaunchManager, ESLifecycleMixin, ESLoadingViewComponent, ESMMapManager$1 as ESMMapManager, ESMMapModule$1 as ESMMapModule, ESManager$1 as ESManager, ESModule$1 as ESModule, ESNetworkManager$1 as ESNetworkManager, ESNetworkMixin, ESNetworkModule$1 as ESNetworkModule, ESPageRootViewComponent, ESPageRouterViewComponent, ESPermissionModule$1 as ESPermissionModule, ESPowerModule$1 as ESPowerModule, ESProgressBarViewComponent, ESQRCodeViewComponent, ESRouter, ESScrollViewComponent, ESSeekBarViewComponent, ESSharedPreferencesModule$1 as ESSharedPreferencesModule, ESStorageModule$1 as ESStorageModule, ESTextViewComponent, ESToast$1 as ESToast, ToastModule as ESToastModule, ESTransitionImageViewComponent, ESUsbDeviceMixin, ESUsbDeviceModule$1 as ESUsbDeviceModule, ES_ACCELERATE_DECELERATE_INTERPOLATOR, ES_ACCELERATE_INTERPOLATOR, ES_ANIMATION_PROPERTY_NAME_ALPHA, ES_ANIMATION_PROPERTY_NAME_ROTATION, ES_ANIMATION_PROPERTY_NAME_SCALE_X, ES_ANIMATION_PROPERTY_NAME_SCALE_Y, ES_ANIMATION_PROPERTY_NAME_TRANSLATION_X, ES_ANIMATION_PROPERTY_NAME_TRANSLATION_Y, ES_ANIMATION_REPEAT_MODE_INFINITE, ES_ANIMATION_REPEAT_MODE_RESTART, ES_ANIMATION_REPEAT_MODE_REVERSE, ES_ANIMATION_TYPE_AFTER, ES_ANIMATION_TYPE_AFTER_DELAY, ES_ANIMATION_TYPE_BEFORE, ES_ANIMATION_TYPE_NONE, ES_ANIMATION_TYPE_PLAY, ES_ANIMATION_TYPE_PLAY_SEQUENTIALLY, ES_ANIMATION_TYPE_PLAY_TOGETHER, ES_ANIMATION_TYPE_WITH, ES_ANIMATION_VALUE_TYPE_FLOAT, ES_ANIMATION_VALUE_TYPE_INT, ES_ANTICIPATE_INTERPOLATOR, ES_ANTICIPATE_OVERSHOOT_INTERPOLATOR, ES_BOUNCE_INTERPOLATOR, ES_CYCLE_INTERPOLATOR, ES_DECELERATE_INTERPOLATOR, ES_FAST_OUT_LINEAR_IN_INTERPOLATOR, ES_FAST_OUT_SLOW_IN_INTERPOLATOR, ES_LINEAR_INTERPOLATOR, ES_MMP_MODE_PRIVATE, ES_MMP_MODE_WORLD_READABLE, ES_MMP_MODE_WORLD_WRITEABLE, ES_NETWORK_INFO_STATE_CONNECTED, ES_NETWORK_INFO_STATE_CONNECTING, ES_NETWORK_INFO_STATE_DISCONNECTED, ES_NETWORK_INFO_STATE_DISCONNECTING, ES_NETWORK_INFO_STATE_SUSPENDED, ES_NETWORK_INFO_STATE_UNKNOWN, ES_NETWORK_INFO_TYPE_ETHERNET, ES_NETWORK_INFO_TYPE_MOBILE, ES_NETWORK_INFO_TYPE_NONE, ES_NETWORK_INFO_TYPE_WIFI, ES_OVERSHOOT_INTERPOLATOR, ES_PATH_INTERPOLATOR, KEYCODE_BACK, KEYCODE_DPAD_CENTER, KEYCODE_DPAD_DOWN, KEYCODE_DPAD_LEFT, KEYCODE_DPAD_RIGHT, KEYCODE_DPAD_UP, KEYCODE_ENTER, KEYCODE_ESCAPE, KEYCODE_MENU, KEYCODE_SEARCH, KEY_ACTION_DOWN, KEY_ACTION_UP, getESApp, setESApp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@extscreen/es-core",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {