From 85d46767581d9d092c68bba577dc9608e624d1a7 Mon Sep 17 00:00:00 2001
From: caominglei <caominglei@h-partners.com>
Date: Tue, 23 Jan 2024 16:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=90=8D=E7=A7=B0=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAlibrary;OAT=E5=90=88=E8=A7=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=B8=85=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: caominglei <caominglei@h-partners.com>
---
 OAT.xml                                                       | 2 ++
 build-profile.json5                                           | 4 ++--
 entry/oh-package.json5                                        | 4 ++--
 {qrcodegen => library}/.gitignore                             | 0
 {qrcodegen => library}/build-profile.json5                    | 0
 {qrcodegen => library}/hvigorfile.ts                          | 0
 {qrcodegen => library}/index.ets                              | 0
 {qrcodegen => library}/oh-package.json5                       | 2 +-
 .../src/main/ets/components/MainPage/qrcodegen.ets            | 0
 {qrcodegen => library}/src/main/module.json5                  | 4 ++--
 .../src/main/resources/base/element/string.json               | 0
 .../src/main/resources/en_US/element/string.json              | 0
 .../src/main/resources/zh_CN/element/string.json              | 0
 13 files changed, 9 insertions(+), 7 deletions(-)
 rename {qrcodegen => library}/.gitignore (100%)
 rename {qrcodegen => library}/build-profile.json5 (100%)
 rename {qrcodegen => library}/hvigorfile.ts (100%)
 rename {qrcodegen => library}/index.ets (100%)
 rename {qrcodegen => library}/oh-package.json5 (99%)
 rename {qrcodegen => library}/src/main/ets/components/MainPage/qrcodegen.ets (100%)
 rename {qrcodegen => library}/src/main/module.json5 (78%)
 rename {qrcodegen => library}/src/main/resources/base/element/string.json (100%)
 rename {qrcodegen => library}/src/main/resources/en_US/element/string.json (100%)
 rename {qrcodegen => library}/src/main/resources/zh_CN/element/string.json (100%)

diff --git a/OAT.xml b/OAT.xml
index b998e1e..749bc93 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -12,6 +12,7 @@
                 <filteritem type="filename" name="hvigor-wrapper.js" desc="项目工程默认文件，不需要添加版权头"/>
                 <filteritem type="filename" name="hvigorw" desc="项目工程默认文件，不需要添加版权头"/>
                 <filteritem type="filename" name="hvigorw.bat" desc="项目工程默认文件，不需要添加版权头"/>
+                <filteritem type="filepath" name="library/src/main/ets/components/MainPage/qrcodegen.ets" desc="源组件的版权信息，无需修改"/>
             </filefilter>
             <filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
                 <filteritem type="filename" name="hvigorfile.ts" desc="项目工程默认文件，不需要添加版权头"/>
@@ -28,6 +29,7 @@
                 <filteritem type="filepath" name="entry/src/ohosTest/resources/base/media/icon.png" desc="图片"/>
                 <filteritem type="filepath" name="AppScope/resources/base/media/app_icon.png" desc="图片"/>
                 <filteritem type="filepath" name="screenshot/screenshot.gif" desc="图片"/>
+                <filteritem type="filepath" name="img.png" desc="图片"/>
             </filefilter>
         </filefilterlist>
         <policylist>
diff --git a/build-profile.json5 b/build-profile.json5
index 96ce925..82b0891 100644
--- a/build-profile.json5
+++ b/build-profile.json5
@@ -24,8 +24,8 @@
       ]
     },
     {
-      "name": "qrcodegen",
-      "srcPath": "./qrcodegen"
+      "name": "library",
+      "srcPath": "./library"
     }
   ]
 }
\ No newline at end of file
diff --git a/entry/oh-package.json5 b/entry/oh-package.json5
index 18f6e6f..29ff35c 100644
--- a/entry/oh-package.json5
+++ b/entry/oh-package.json5
@@ -6,6 +6,6 @@
   "repository": "",
   "version": "2.0.1-rc.0",
   "dependencies": {
-    "@ohos/qr-code-generator": "file:../qrcodegen"
+    "@ohos/qr-code-generator": "file:../library"
   }
-}
+}
\ No newline at end of file
diff --git a/qrcodegen/.gitignore b/library/.gitignore
similarity index 100%
rename from qrcodegen/.gitignore
rename to library/.gitignore
diff --git a/qrcodegen/build-profile.json5 b/library/build-profile.json5
similarity index 100%
rename from qrcodegen/build-profile.json5
rename to library/build-profile.json5
diff --git a/qrcodegen/hvigorfile.ts b/library/hvigorfile.ts
similarity index 100%
rename from qrcodegen/hvigorfile.ts
rename to library/hvigorfile.ts
diff --git a/qrcodegen/index.ets b/library/index.ets
similarity index 100%
rename from qrcodegen/index.ets
rename to library/index.ets
diff --git a/qrcodegen/oh-package.json5 b/library/oh-package.json5
similarity index 99%
rename from qrcodegen/oh-package.json5
rename to library/oh-package.json5
index 2c27567..4cfbe42 100644
--- a/qrcodegen/oh-package.json5
+++ b/library/oh-package.json5
@@ -14,4 +14,4 @@
   "repository": "https://gitee.com/openharmony-sig/qr-code-generator",
   "version": "2.0.1-rc.0",
   "dependencies": {}
-}
+}
\ No newline at end of file
diff --git a/qrcodegen/src/main/ets/components/MainPage/qrcodegen.ets b/library/src/main/ets/components/MainPage/qrcodegen.ets
similarity index 100%
rename from qrcodegen/src/main/ets/components/MainPage/qrcodegen.ets
rename to library/src/main/ets/components/MainPage/qrcodegen.ets
diff --git a/qrcodegen/src/main/module.json5 b/library/src/main/module.json5
similarity index 78%
rename from qrcodegen/src/main/module.json5
rename to library/src/main/module.json5
index 747b650..0204bcb 100644
--- a/qrcodegen/src/main/module.json5
+++ b/library/src/main/module.json5
@@ -1,10 +1,10 @@
 {
   "module": {
-    "name": "qrcodegen",
+    "name": "library",
     "type": "har",
     "deviceTypes": [
       "default",
       "tablet"
     ]
   }
-}
+}
\ No newline at end of file
diff --git a/qrcodegen/src/main/resources/base/element/string.json b/library/src/main/resources/base/element/string.json
similarity index 100%
rename from qrcodegen/src/main/resources/base/element/string.json
rename to library/src/main/resources/base/element/string.json
diff --git a/qrcodegen/src/main/resources/en_US/element/string.json b/library/src/main/resources/en_US/element/string.json
similarity index 100%
rename from qrcodegen/src/main/resources/en_US/element/string.json
rename to library/src/main/resources/en_US/element/string.json
diff --git a/qrcodegen/src/main/resources/zh_CN/element/string.json b/library/src/main/resources/zh_CN/element/string.json
similarity index 100%
rename from qrcodegen/src/main/resources/zh_CN/element/string.json
rename to library/src/main/resources/zh_CN/element/string.json
-- 
Gitee