diff --git a/ability/ORM/screenshots/device/backup.jpg b/ability/ORM/screenshots/device/backup.jpg deleted file mode 100644 index 64eb4c3e4558bfa13271453e69116b2a805d7218..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/backup.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/delete.jpg b/ability/ORM/screenshots/device/delete.jpg deleted file mode 100644 index c412b7b20ac89a74dfcd47fb3b4a5726bfa56fbc..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/delete.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/deleteDB.jpg b/ability/ORM/screenshots/device/deleteDB.jpg deleted file mode 100644 index 2516b66336fcc81759d2d4ef9b1cb5f857cdba25..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/deleteDB.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/insert.jpg b/ability/ORM/screenshots/device/insert.jpg deleted file mode 100644 index 613c8eb20221894b869c77937d52170b1200d918..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/insert.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/query.jpg b/ability/ORM/screenshots/device/query.jpg deleted file mode 100644 index 8b8f2c00a61942faf745e5cad8a14948ef7cd4a1..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/query.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/restore.jpg b/ability/ORM/screenshots/device/restore.jpg deleted file mode 100644 index ae0b2aa4d51ed73386bab4e43dc4d2454189f6c3..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/restore.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/update.jpg b/ability/ORM/screenshots/device/update.jpg deleted file mode 100644 index 03a7f4c63a52e2947fe8e0fe411608948e10b6dd..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/update.jpg and /dev/null differ diff --git a/ability/ORM/screenshots/device/upgrade.png b/ability/ORM/screenshots/device/upgrade.png deleted file mode 100644 index d89a027c63937ec89853b43214d8232da64de180..0000000000000000000000000000000000000000 Binary files a/ability/ORM/screenshots/device/upgrade.png and /dev/null differ diff --git a/data/ORM/README.md b/data/ORM/README.md new file mode 100644 index 0000000000000000000000000000000000000000..f8e3db3ef4c60d55a0afda97fb43838fcda8b9b9 --- /dev/null +++ b/data/ORM/README.md @@ -0,0 +1,20 @@ +# Object Relational Mapping \(ORM\) Database + +### Introduction + +This sample uses annotations and inheritance to create databases and tables, allowing for database upgrade, backup, deletion, and restoration, table adding, deletion, modification, and query, and listening for data changes. + +1. An ORM database is annotated by **@Database** and inherited from **OrmDatabase**. +2. A table in the ORM database is annotated by **@Entity** and inherited from **OrmObject**. +3. **OrmContext** is used to upgrade, back up, delete and restore the database, add, delete, modify, and query tables, and listen for data changes. + +### Usage + +1. Click **Insert** to insert data, click **Update** to update data, click **Delete** to delete data, and click **Query** to query data and view the query result. +2. Click **Upgrade** to upgrade the database from version 1 to version 2 and then to version 3. +3. Click **Backup** to back up the database, click **DeleteDB** to delete the database, and click **Restore** to restore the database. + +### Constraints + +This sample can only be run on standard-system devices. + diff --git a/ability/ORM/README_zh.md b/data/ORM/README_zh.md similarity index 100% rename from ability/ORM/README_zh.md rename to data/ORM/README_zh.md diff --git a/ability/ORM/build.gradle b/data/ORM/build.gradle similarity index 100% rename from ability/ORM/build.gradle rename to data/ORM/build.gradle diff --git a/ability/ORM/entry/build.gradle b/data/ORM/entry/build.gradle similarity index 100% rename from ability/ORM/entry/build.gradle rename to data/ORM/entry/build.gradle diff --git a/ability/ORM/entry/src/main/config.json b/data/ORM/entry/src/main/config.json similarity index 100% rename from ability/ORM/entry/src/main/config.json rename to data/ORM/entry/src/main/config.json diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/MainAbility.java b/data/ORM/entry/src/main/java/ohos/samples/orm/MainAbility.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/MainAbility.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/MainAbility.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataType.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataType.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataType.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataType.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataTypeUpgrade.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataTypeUpgrade.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataTypeUpgrade.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/AllDataTypeUpgrade.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/Book.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/Book.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/Book.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/Book.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/BookStore.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/BookStore.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/BookStore.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/BookStore.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/BookStoreUpgrade.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/BookStoreUpgrade.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/BookStoreUpgrade.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/BookStoreUpgrade.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/BookUpgrade.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/BookUpgrade.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/BookUpgrade.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/BookUpgrade.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/User.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/User.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/User.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/User.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/model/UserUpgrade.java b/data/ORM/entry/src/main/java/ohos/samples/orm/model/UserUpgrade.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/model/UserUpgrade.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/model/UserUpgrade.java diff --git a/ability/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java b/data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java similarity index 100% rename from ability/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java rename to data/ORM/entry/src/main/java/ohos/samples/orm/slice/OrmContextSlice.java diff --git a/ability/ORM/entry/src/main/resources/base/element/color.json b/data/ORM/entry/src/main/resources/base/element/color.json similarity index 100% rename from ability/ORM/entry/src/main/resources/base/element/color.json rename to data/ORM/entry/src/main/resources/base/element/color.json diff --git a/ability/ORM/entry/src/main/resources/base/element/float.json b/data/ORM/entry/src/main/resources/base/element/float.json similarity index 100% rename from ability/ORM/entry/src/main/resources/base/element/float.json rename to data/ORM/entry/src/main/resources/base/element/float.json diff --git a/ability/ORM/entry/src/main/resources/base/element/pattern.json b/data/ORM/entry/src/main/resources/base/element/pattern.json similarity index 100% rename from ability/ORM/entry/src/main/resources/base/element/pattern.json rename to data/ORM/entry/src/main/resources/base/element/pattern.json diff --git a/ability/ORM/entry/src/main/resources/base/element/string.json b/data/ORM/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/ORM/entry/src/main/resources/base/element/string.json rename to data/ORM/entry/src/main/resources/base/element/string.json diff --git a/ability/ORM/entry/src/main/resources/base/graphic/button_blue.xml b/data/ORM/entry/src/main/resources/base/graphic/button_blue.xml similarity index 100% rename from ability/ORM/entry/src/main/resources/base/graphic/button_blue.xml rename to data/ORM/entry/src/main/resources/base/graphic/button_blue.xml diff --git a/ability/ORM/entry/src/main/resources/base/graphic/button_blue_empty.xml b/data/ORM/entry/src/main/resources/base/graphic/button_blue_empty.xml similarity index 100% rename from ability/ORM/entry/src/main/resources/base/graphic/button_blue_empty.xml rename to data/ORM/entry/src/main/resources/base/graphic/button_blue_empty.xml diff --git a/ability/ORM/entry/src/main/resources/base/graphic/button_blue_pressed.xml b/data/ORM/entry/src/main/resources/base/graphic/button_blue_pressed.xml similarity index 100% rename from ability/ORM/entry/src/main/resources/base/graphic/button_blue_pressed.xml rename to data/ORM/entry/src/main/resources/base/graphic/button_blue_pressed.xml diff --git a/ability/ORM/entry/src/main/resources/base/graphic/text_background.xml b/data/ORM/entry/src/main/resources/base/graphic/text_background.xml similarity index 100% rename from ability/ORM/entry/src/main/resources/base/graphic/text_background.xml rename to data/ORM/entry/src/main/resources/base/graphic/text_background.xml diff --git a/ability/ORM/entry/src/main/resources/base/layout/ability_main.xml b/data/ORM/entry/src/main/resources/base/layout/ability_main.xml similarity index 100% rename from ability/ORM/entry/src/main/resources/base/layout/ability_main.xml rename to data/ORM/entry/src/main/resources/base/layout/ability_main.xml diff --git a/ability/ORM/entry/src/main/resources/base/media/icon.png b/data/ORM/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/ORM/entry/src/main/resources/base/media/icon.png rename to data/ORM/entry/src/main/resources/base/media/icon.png diff --git a/ability/ORM/entry/src/main/resources/en/element/string.json b/data/ORM/entry/src/main/resources/en/element/string.json similarity index 100% rename from ability/ORM/entry/src/main/resources/en/element/string.json rename to data/ORM/entry/src/main/resources/en/element/string.json diff --git a/ability/ORM/entry/src/main/resources/zh/element/string.json b/data/ORM/entry/src/main/resources/zh/element/string.json similarity index 100% rename from ability/ORM/entry/src/main/resources/zh/element/string.json rename to data/ORM/entry/src/main/resources/zh/element/string.json diff --git a/data/ORM/screenshots/device/backup.png b/data/ORM/screenshots/device/backup.png new file mode 100644 index 0000000000000000000000000000000000000000..3d4356a0629fd1c64941f929fbc0b6d89cdd442e Binary files /dev/null and b/data/ORM/screenshots/device/backup.png differ diff --git a/data/ORM/screenshots/device/delete.png b/data/ORM/screenshots/device/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..2b4f56672988d453b76e8bcd1526ac2f22a678c1 Binary files /dev/null and b/data/ORM/screenshots/device/delete.png differ diff --git a/data/ORM/screenshots/device/deleteDB.png b/data/ORM/screenshots/device/deleteDB.png new file mode 100644 index 0000000000000000000000000000000000000000..133dfc7077a8400319c380c5c0eadf92fffc0704 Binary files /dev/null and b/data/ORM/screenshots/device/deleteDB.png differ diff --git a/data/ORM/screenshots/device/insert.png b/data/ORM/screenshots/device/insert.png new file mode 100644 index 0000000000000000000000000000000000000000..84874ac1030d7fff607931aac5e4fbd907ce6fd6 Binary files /dev/null and b/data/ORM/screenshots/device/insert.png differ diff --git a/data/ORM/screenshots/device/query.png b/data/ORM/screenshots/device/query.png new file mode 100644 index 0000000000000000000000000000000000000000..86bae787ca79636de894e27bdfb30b0e6b060ef6 Binary files /dev/null and b/data/ORM/screenshots/device/query.png differ diff --git a/data/ORM/screenshots/device/restore.png b/data/ORM/screenshots/device/restore.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc9637eb189250e82ad74192d2820ca56104739 Binary files /dev/null and b/data/ORM/screenshots/device/restore.png differ diff --git a/data/ORM/screenshots/device/update.png b/data/ORM/screenshots/device/update.png new file mode 100644 index 0000000000000000000000000000000000000000..20fc826509b8bf3fa00a06722543629a04dea9f7 Binary files /dev/null and b/data/ORM/screenshots/device/update.png differ diff --git a/data/ORM/screenshots/device/upgrade.png b/data/ORM/screenshots/device/upgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..07ff204b694702bb93186dd4ba17859a6910893a Binary files /dev/null and b/data/ORM/screenshots/device/upgrade.png differ diff --git a/ability/ORM/settings.gradle b/data/ORM/settings.gradle similarity index 100% rename from ability/ORM/settings.gradle rename to data/ORM/settings.gradle diff --git a/ability/Preferences/README_zh.md b/data/Preferences/README_zh.md similarity index 100% rename from ability/Preferences/README_zh.md rename to data/Preferences/README_zh.md diff --git a/ability/Preferences/build.gradle b/data/Preferences/build.gradle similarity index 100% rename from ability/Preferences/build.gradle rename to data/Preferences/build.gradle diff --git a/ability/Preferences/entry/build.gradle b/data/Preferences/entry/build.gradle similarity index 100% rename from ability/Preferences/entry/build.gradle rename to data/Preferences/entry/build.gradle diff --git a/ability/Preferences/entry/package.json b/data/Preferences/entry/package.json similarity index 100% rename from ability/Preferences/entry/package.json rename to data/Preferences/entry/package.json diff --git a/ability/Preferences/entry/src/main/config.json b/data/Preferences/entry/src/main/config.json similarity index 100% rename from ability/Preferences/entry/src/main/config.json rename to data/Preferences/entry/src/main/config.json diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/MainAbility.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/MainAbility.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/MainAbility.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/MainAbility.java diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/PreferencesInternalAbility.java diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/entities/ColorEntry.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/entities/ColorEntry.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/entities/ColorEntry.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/entities/ColorEntry.java diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/entities/LoginEntry.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/entities/LoginEntry.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/entities/LoginEntry.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/entities/LoginEntry.java diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/entities/SplashEntry.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/entities/SplashEntry.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/entities/SplashEntry.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/entities/SplashEntry.java diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/utils/Constants.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/Constants.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/utils/Constants.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/Constants.java diff --git a/ability/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java b/data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java similarity index 100% rename from ability/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java rename to data/Preferences/entry/src/main/java/ohos/samples/preferences/utils/LogUtil.java diff --git a/ability/Preferences/entry/src/main/js/default/app.js b/data/Preferences/entry/src/main/js/default/app.js similarity index 100% rename from ability/Preferences/entry/src/main/js/default/app.js rename to data/Preferences/entry/src/main/js/default/app.js diff --git a/ability/Preferences/entry/src/main/js/default/common/icon.png b/data/Preferences/entry/src/main/js/default/common/icon.png similarity index 100% rename from ability/Preferences/entry/src/main/js/default/common/icon.png rename to data/Preferences/entry/src/main/js/default/common/icon.png diff --git a/ability/Preferences/entry/src/main/js/default/common/logo.png b/data/Preferences/entry/src/main/js/default/common/logo.png similarity index 100% rename from ability/Preferences/entry/src/main/js/default/common/logo.png rename to data/Preferences/entry/src/main/js/default/common/logo.png diff --git a/ability/Preferences/entry/src/main/js/default/i18n/en-US.json b/data/Preferences/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from ability/Preferences/entry/src/main/js/default/i18n/en-US.json rename to data/Preferences/entry/src/main/js/default/i18n/en-US.json diff --git a/ability/Preferences/entry/src/main/js/default/pages/login/login.css b/data/Preferences/entry/src/main/js/default/pages/login/login.css similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/login/login.css rename to data/Preferences/entry/src/main/js/default/pages/login/login.css diff --git a/ability/Preferences/entry/src/main/js/default/pages/login/login.hml b/data/Preferences/entry/src/main/js/default/pages/login/login.hml similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/login/login.hml rename to data/Preferences/entry/src/main/js/default/pages/login/login.hml diff --git a/ability/Preferences/entry/src/main/js/default/pages/login/login.js b/data/Preferences/entry/src/main/js/default/pages/login/login.js similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/login/login.js rename to data/Preferences/entry/src/main/js/default/pages/login/login.js diff --git a/ability/Preferences/entry/src/main/js/default/pages/main/main.css b/data/Preferences/entry/src/main/js/default/pages/main/main.css similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/main/main.css rename to data/Preferences/entry/src/main/js/default/pages/main/main.css diff --git a/ability/Preferences/entry/src/main/js/default/pages/main/main.hml b/data/Preferences/entry/src/main/js/default/pages/main/main.hml similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/main/main.hml rename to data/Preferences/entry/src/main/js/default/pages/main/main.hml diff --git a/ability/Preferences/entry/src/main/js/default/pages/main/main.js b/data/Preferences/entry/src/main/js/default/pages/main/main.js similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/main/main.js rename to data/Preferences/entry/src/main/js/default/pages/main/main.js diff --git a/ability/Preferences/entry/src/main/js/default/pages/splash/splash.css b/data/Preferences/entry/src/main/js/default/pages/splash/splash.css similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/splash/splash.css rename to data/Preferences/entry/src/main/js/default/pages/splash/splash.css diff --git a/ability/Preferences/entry/src/main/js/default/pages/splash/splash.hml b/data/Preferences/entry/src/main/js/default/pages/splash/splash.hml similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/splash/splash.hml rename to data/Preferences/entry/src/main/js/default/pages/splash/splash.hml diff --git a/ability/Preferences/entry/src/main/js/default/pages/splash/splash.js b/data/Preferences/entry/src/main/js/default/pages/splash/splash.js similarity index 100% rename from ability/Preferences/entry/src/main/js/default/pages/splash/splash.js rename to data/Preferences/entry/src/main/js/default/pages/splash/splash.js diff --git a/ability/Preferences/entry/src/main/resources/base/element/string.json b/data/Preferences/entry/src/main/resources/base/element/string.json similarity index 100% rename from ability/Preferences/entry/src/main/resources/base/element/string.json rename to data/Preferences/entry/src/main/resources/base/element/string.json diff --git a/ability/Preferences/entry/src/main/resources/base/media/icon.png b/data/Preferences/entry/src/main/resources/base/media/icon.png similarity index 100% rename from ability/Preferences/entry/src/main/resources/base/media/icon.png rename to data/Preferences/entry/src/main/resources/base/media/icon.png diff --git a/ability/Preferences/screenshots/device/background_color_from_preference.png b/data/Preferences/screenshots/device/background_color_from_preference.png similarity index 100% rename from ability/Preferences/screenshots/device/background_color_from_preference.png rename to data/Preferences/screenshots/device/background_color_from_preference.png diff --git a/ability/Preferences/screenshots/device/default_background.png b/data/Preferences/screenshots/device/default_background.png similarity index 100% rename from ability/Preferences/screenshots/device/default_background.png rename to data/Preferences/screenshots/device/default_background.png diff --git a/ability/Preferences/screenshots/device/login_screen.png b/data/Preferences/screenshots/device/login_screen.png similarity index 100% rename from ability/Preferences/screenshots/device/login_screen.png rename to data/Preferences/screenshots/device/login_screen.png diff --git a/ability/Preferences/screenshots/device/splash_screen.png b/data/Preferences/screenshots/device/splash_screen.png similarity index 100% rename from ability/Preferences/screenshots/device/splash_screen.png rename to data/Preferences/screenshots/device/splash_screen.png diff --git a/ability/Preferences/settings.gradle b/data/Preferences/settings.gradle similarity index 100% rename from ability/Preferences/settings.gradle rename to data/Preferences/settings.gradle