验证修改

Author: 18829029633

harmony/sensors.har

@@ -1,11 +1,10 @@
 {
   "name": "rnoh-sensors",
   "version": "1.0.0",
-  devDependencies: {
+  dependencies: {
     rnoh: 'file:../rnoh',
   },
   "main": "Index.ets",
   "author": "",
-  "license": "Apache-2.0",
-  "dependencies": {}
+  "license": "Apache-2.0"
 }

harmony/sensors/oh-package.json5

@@ -12,8 +12,8 @@
     "semantic-release": "semantic-release",
     "travis-deploy-once": "travis-deploy-once"
   },
-  "main": "index.js",
-  "types": "index.d.ts",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
   "repository": "git@github.com:react-native-sensors/react-native-sensors.git",
   "homepage": "https://github.com/react-native-sensors/react-native-sensors",
   "keywords": [
@@ -74,14 +74,9 @@
   },
   "files": [
     "/RNSensors.podspec",
-    "/src/*.js",
-    "/index.*",
-    "/android/",
-    "/ios/",
-    "/windows/",
+    "/src/",
+    "/harmony/",
     "/LICENSE",
-    "/README.md",
-    "/scripts/",
-    "/website/"
+    "/README.md"
   ]
 }

package.json

@@ -1,5 +1,3 @@
-import React from "react";
-import RTNSensors from "./NativeSensors";
 import { DeviceEventEmitter } from "react-native";
 import { Observable } from "rxjs";
 import { publish, refCount } from "rxjs/operators";
@@ -13,13 +11,13 @@ const listenerKeys = new Map([
   ["orientation", "orientationClick"],
   ["gravity", "gravityClick"],
 ]);
-const SensorType = {
+export const SensorTypes = {
   accelerometer: "accelerometer",
-  gyroscope: "accelerometer",
-  magnetometer: "accelerometer",
-  barometer: "accelerometer",
-  orientation: "accelerometer",
-  gravity: "accelerometer",
+  gyroscope: "gyroscope",
+  magnetometer: "magnetometer",
+  barometer: "barometer",
+  orientation: "orientation",
+  gravity: "gravity",
 };
 
 const eventEmitterSubscription = new Map([
@@ -34,18 +32,14 @@ const eventEmitterSubscription = new Map([
 function createSensorObservable(sensorType) {
   return Observable.create(function subscribe(observer) {
     this.isSensorAvailable = false;
-    if (eventEmitterSubscription.get(sensorType)) {
-      eventEmitterSubscription.get(sensorType).remove();
-      RTNSensors.off(sensorType);
-    }
     this.unsubscribeCallback = () => {
       if (!this.isSensorAvailable) return;
       if (eventEmitterSubscription.get(sensorType)) eventEmitterSubscription.get(sensorType).remove();
       RTNSensors.off(sensorType);
       RTNSensors.setUpdateInterval(sensorType, 0);
       RTNSensors.setLogLevel(sensorType, 0);
     };
-    RTNSensors.isAvailable(SensorType).then((res) => {
+    RTNSensors.isAvailable(sensorType).then((res) => {
       this.isSensorAvailable = true;
       if (!res) {
         observer.error(`Sensors${sensorType} is not available`);
@@ -81,7 +75,7 @@ function createSensorObservable(sensorType) {
       }
     });
     return this.unsubscribeCallback;
-  }).pipe(makeSingleton);
+  }).pipe(makeSingleton());
 }
 function makeSingleton() {
   return (source) => source.pipe(publish(), refCount());