Skip to content

Commit b0b9aac

Browse files
author
houningjuanNew
committed
use codegen
1 parent 6f98c4c commit b0b9aac

File tree

10 files changed

+27
-214
lines changed

10 files changed

+27
-214
lines changed

harmony/image_editor.har

-1.17 KB
Binary file not shown.

harmony/image_editor/README.md

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ ImageEditor.cropImage(uri, cropData).then((result) => {
6767

6868
```json
6969
"dependencies": {
70-
"rnoh": "file:../rnoh",
71-
"rnoh-image-editor": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor.har"
70+
"@rnoh/react-native-openharmony": "file:../react_native_openharmony",
71+
"@react-native-oh-tpl/image-editor": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor.har"
7272
}
7373
```
7474

@@ -89,8 +89,8 @@ ohpm install
8989

9090
```json
9191
"dependencies": {
92-
"rnoh": "file:../rnoh",
93-
"rnoh-image-editor": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor"
92+
"@rnoh/react-native-openharmony": "file:../react_native_openharmony",
93+
"@react-native-oh-tpl/image-editor": "file:../../node_modules/@react-native-oh-tpl/image-editor/harmony/image_editor"
9494
}
9595
```
9696

@@ -101,54 +101,6 @@ cd entry
101101
ohpm install --no-link
102102
```
103103

104-
### 配置 CMakeLists 和引入ImageEditorPackage
105-
106-
打开 `entry/src/main/cpp/CMakeLists.txt`,添加:
107-
108-
```diff
109-
project(rnapp)
110-
cmake_minimum_required(VERSION 3.4.1)
111-
set(RNOH_APP_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
112-
set(OH_MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../oh_modules")
113-
set(RNOH_CPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../react-native-harmony/harmony/cpp")
114-
115-
add_subdirectory("${RNOH_CPP_DIR}" ./rn)
116-
117-
# RNOH_BEGIN: add_package_subdirectories
118-
add_subdirectory("../../../../sample_package/src/main/cpp" ./sample-package)
119-
+ add_subdirectory("${OH_MODULE_DIR}/rnoh-image-editor/src/main/cpp" ./image-editor)
120-
# RNOH_END: add_package_subdirectories
121-
122-
add_library(rnoh_app SHARED
123-
"./PackageProvider.cpp"
124-
"${RNOH_CPP_DIR}/RNOHAppNapiBridge.cpp"
125-
)
126-
127-
target_link_libraries(rnoh_app PUBLIC rnoh)
128-
129-
# RNOH_BEGIN: link_packages
130-
target_link_libraries(rnoh_app PUBLIC rnoh_sample_package)
131-
+ target_link_libraries(rnoh_app PUBLIC rnoh_image_editor)
132-
# RNOH_END: link_packages
133-
```
134-
135-
打开 `entry/src/main/cpp/PackageProvider.cpp`,添加:
136-
137-
```diff
138-
#include "RNOH/PackageProvider.h"
139-
#include "SamplePackage.h"
140-
+ #include "ImageEditorPackage.h"
141-
142-
using namespace rnoh;
143-
144-
std::vector<std::shared_ptr<Package>> PackageProvider::getPackages(Package::Context ctx) {
145-
return {
146-
std::make_shared<SamplePackage>(ctx),
147-
+ std::make_shared<ImageEditorPackage>(ctx)
148-
};
149-
}
150-
```
151-
152104

153105

154106
### 在 ArkTs 侧引入 ImageEditorPackage
@@ -157,7 +109,7 @@ std::vector<std::shared_ptr<Package>> PackageProvider::getPackages(Package::Cont
157109

158110
```diff
159111
...
160-
+ import {ImageEditorPackage} from "rnoh-image-editor/ts";
112+
+ import {ImageEditorPackage} from "@react-native-oh-tpl/image-editor/ts";
161113

162114
export function createRNPackages(ctx: RNPackageContext): RNPackage[] {
163115
return [
@@ -184,7 +136,9 @@ ohpm install
184136

185137
### 兼容性
186138

187-
要使用此库,需要使用正确的 React-Native 和 RNOH 版本。另外,还需要使用配套的 DevEco Studio 和 手机 ROM。
139+
本文档内容基于以下版本验证通过:
140+
141+
RNOH:0.72.20; SDK:HarmonyOS-NEXT-DB1; IDE:DevEco Studio 5.0.3.200; ROM:2.0.0.13;
188142

189143
请到三方库相应的 Releases 发布地址查看 Release 配套的版本信息:[Releases](https://github.com/react-native-oh-library/react-native-image-editor/releases)
190144

harmony/image_editor/oh-package.json5

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "rnoh-image-editor",
3-
"version": "3.2.0-0.0.1",
2+
"name": "@react-native-oh-tpl/image-editor",
3+
"version": "3.2.0-0.1.0",
44
"description": "Please describe the basic information.",
55
"main": "index.ets",
66
"author": "",
77
"license": "Apache-2.0",
8-
dependencies: {
9-
rnoh: 'file:../rnoh'
8+
"dependencies": {
9+
"@rnoh/react-native-openharmony": "file:../react_native_openharmony"
1010
}
1111
}

harmony/image_editor/src/main/cpp/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

harmony/image_editor/src/main/cpp/ImageEditorPackage.h

Lines changed: 0 additions & 59 deletions
This file was deleted.

harmony/image_editor/src/main/cpp/ImageEditorTurboModule.cpp

Lines changed: 0 additions & 46 deletions
This file was deleted.

harmony/image_editor/src/main/cpp/ImageEditorTurboModule.h

Lines changed: 0 additions & 35 deletions
This file was deleted.

harmony/image_editor/src/main/ets/ImageEditorModule.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
* SOFTWARE.
2323
*/
2424

25-
import { TurboModule } from 'rnoh/ts'
25+
import { TurboModule } from '@rnoh/react-native-openharmony/ts'
26+
import { TM } from "@rnoh/react-native-openharmony/generated/ts"
2627
import Logger from './Logger'
2728
import http from '@ohos.net.http'
2829
import ResponseCode from '@ohos.net.http'
@@ -259,7 +260,7 @@ async function TargetRect(newOptions: ImageCropData, resizeScaleSize?: size) {
259260
return targetRegion
260261
}
261262

262-
export class ImageEditorModule extends TurboModule {
263+
export class ImageEditorModule extends TurboModule implements TM.RNCImageEditor.Spec {
263264
async cropImage(uri: string, options: ImageCropData): Promise<string>{
264265
const offset = options.offset
265266
const size = options.size

harmony/image_editor/src/main/ets/ImageEditorPackage.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,21 @@
2222
* SOFTWARE.
2323
*/
2424

25-
import {RNPackage, TurboModulesFactory} from 'rnoh/ts';
26-
import type {TurboModule, TurboModuleContext} from 'rnoh/ts';
25+
import {RNPackage, TurboModulesFactory} from '@rnoh/react-native-openharmony/ts';
26+
import type {TurboModule, TurboModuleContext} from '@rnoh/react-native-openharmony/ts';
27+
import { TM } from "@rnoh/react-native-openharmony/generated/ts";
2728
import {ImageEditorModule} from './ImageEditorModule';
2829

2930
class ImageEditorModulesFactory extends TurboModulesFactory {
3031
createTurboModule(name: string): TurboModule | null {
31-
if (name === 'RNCImageEditor') {
32+
if (name === TM.RNCImageEditor.NAME) {
3233
return new ImageEditorModule(this.ctx);
3334
}
3435
return null;
3536
}
3637

3738
hasTurboModule(name: string): boolean {
38-
return name === 'RNCImageEditor';
39+
return name === TM.RNCImageEditor.NAME;
3940
}
4041
}
4142

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-oh-tpl/image-editor",
3-
"version": "3.2.0-0.0.1",
3+
"version": "3.2.0-0.1.0",
44
"description": "React Native Image Editing native modules for iOS & Android & Harmony",
55
"main": "lib/commonjs/index",
66
"module": "lib/module/index",
@@ -14,7 +14,12 @@
1414
"url": "https://github.com/callstack/react-native-image-editor/issues"
1515
},
1616
"harmony": {
17-
"alias": "@react-native-community/image-editor"
17+
"alias": "@react-native-community/image-editor",
18+
"codegenConfig": {
19+
"specPaths": [
20+
"./src"
21+
]
22+
}
1823
},
1924
"license": "MIT",
2025
"keywords": [

0 commit comments

Comments
 (0)