Merge pull request #5 from react-native-oh-library/dev

Wang-Yuanbai · web-flow · commit 5e93c5d027f5 · 2023-12-14T20:00:13.000+08:00
更新公仓配置
diff --git a/harmony/exception_handler.har b/harmony/exception_handler.har
diff --git a/harmony/exception_handler/hvigorfile.ts b/harmony/exception_handler/hvigorfile.ts
@@ -1,6 +1 @@
-import { harTasks } from '@ohos/hvigor-ohos-plugin';
-
-export default {
-    system: harTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
-    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
-}
+export { harTasks } from '@ohos/hvigor-ohos-plugin';
diff --git a/harmony/exception_handler/src/main/module.json5 b/harmony/exception_handler/src/main/module.json5
@@ -3,9 +3,7 @@
     "name": "exception_handler",
     "type": "har",
     "deviceTypes": [
-      "default",
-      "tablet",
-      "2in1"
+      "default"
     ]
   }
 }
diff --git a/harmony/exception_handler/src/main/resources/base/media/ic_public_error.svg b/harmony/exception_handler/src/main/resources/base/media/ic_public_error.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" viewBox="0 0 24 24" version="1.1">
     <!-- Generator: Sketch 63.1 (92452) - https://sketch.com -->
     <title>Public/ic_public_error</title>
     <desc>Created with Sketch.</desc>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-native-oh-tpl/react-native-exception-handler",
-  "version": "2.10.10-0.0.4",
+  "version": "2.10.10-0.0.5",
   "description": "A react native module that lets you to register a global error handler that can capture fatal/non fatal uncaught exceptions.",
   "react-native": "src/index",
   "source": "src/index",
@@ -18,6 +18,7 @@
     "!android/build",
     "ios",
     "!ios/build",
+    "harmony/exception_handler",
     "harmony/exception_handler.har",
     "!harmony/build",
     "!harmony/oh_modules",
diff --git a/src/index.tsx b/src/index.tsx
@@ -55,6 +55,9 @@ export const setNativeExceptionHandler = (handler = noop, forceAppQuit = true, e
   }
   if (Platform.OS === "ios") {
     ExceptionHandlerTurboModule.setHandlerforNativeException(handler, executeDefaultHandler);
+	// @ts-ignore
+  } else if (Platform.OS === "harmony") {
+    ExceptionHandlerTurboModule.setHandlerforNativeException(handler, forceAppQuit, executeDefaultHandler);
   } else {
     ExceptionHandlerTurboModule.setHandlerforNativeException(handler, forceAppQuit, executeDefaultHandler);
   }

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,7 @@`
`3`	`3`	`"name": "exception_handler",`
`4`	`4`	`"type": "har",`
`5`	`5`	`"deviceTypes": [`
`6`		`- "default",`
`7`		`- "tablet",`
`8`		`- "2in1"`
	`6`	`+ "default"`
`9`	`7`	`]`
`10`	`8`	`}`
`11`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ export const setNativeExceptionHandler = (handler = noop, forceAppQuit = true, e`
`55`	`55`	`}`
`56`	`56`	`if (Platform.OS === "ios") {`
`57`	`57`	`ExceptionHandlerTurboModule.setHandlerforNativeException(handler, executeDefaultHandler);`
	`58`	`+ // @ts-ignore`
	`59`	`+ } else if (Platform.OS === "harmony") {`
	`60`	`+ ExceptionHandlerTurboModule.setHandlerforNativeException(handler, forceAppQuit, executeDefaultHandler);`
`58`	`61`	`} else {`
`59`	`62`	`ExceptionHandlerTurboModule.setHandlerforNativeException(handler, forceAppQuit, executeDefaultHandler);`
`60`	`63`	`}`