From c63095290910ff364eeae8c083d9f1c3b2be2bd8 Mon Sep 17 00:00:00 2001 From: Korobeinikov Evgeny Date: Wed, 12 Feb 2025 14:26:56 +0300 Subject: [PATCH] Command line tools download --- .../{navigation => application}/AppScope/app.json5 | 0 .../AppScope/resources/base/element/string.json | 0 .../AppScope/resources/base/media/app_icon.png | Bin .../{navigation => application}/build-profile.json5 | 0 .../{navigation => application}/code-linter.json5 | 0 .../{navigation => application}/entry/.gitignore | 0 .../entry/build-profile.json5 | 0 .../{navigation => application}/entry/hvigorfile.ts | 0 .../entry/obfuscation-rules.txt | 0 .../entry/oh-package.json5 | 0 .../src/main/ets/entryability/EntryAbility.ets | 0 .../ets/entrybackupability/EntryBackupAbility.ets | 0 .../entry/src/main/ets/pages/Index.ets | 0 .../entry/src/main/module.json5 | 0 .../src/main/resources/base/element/color.json | 0 .../src/main/resources/base/element/string.json | 0 .../src/main/resources/base/media/background.png | Bin .../src/main/resources/base/media/foreground.png | Bin .../main/resources/base/media/layered_image.json | 0 .../src/main/resources/base/media/startIcon.png | Bin .../main/resources/base/profile/backup_config.json | 0 .../src/main/resources/base/profile/main_pages.json | 0 .../src/main/resources/en_US/element/string.json | 0 .../src/main/resources/zh_CN/element/string.json | 0 .../entry/src/mock/mock-config.json5 | 0 .../entry/src/ohosTest/ets/test/Ability.test.ets | 0 .../entry/src/ohosTest/ets/test/List.test.ets | 0 .../entry/src/ohosTest/module.json5 | 0 .../entry/src/test/List.test.ets | 0 .../entry/src/test/LocalUnit.test.ets | 0 .../hvigor/hvigor-config.json5 | 0 .../{navigation => application}/hvigorfile.ts | 0 .../{navigation => application}/local.properties | 0 .../oh-package-lock.json5 | 0 .../{navigation => application}/oh-package.json5 | 0 arkoala-arkts/navigation/package.json | 12 +++++++----- arkoala-arkts/navigation/user/package.json | 12 ++++++------ .../{shopping => application}/AppScope/app.json5 | 0 .../AppScope/resources/base/element/string.json | 0 .../AppScope/resources/base/media/app_icon.png | Bin .../{shopping => application}/build-profile.json5 | 0 .../{shopping => application}/code-linter.json5 | 0 .../{shopping => application}/entry/.gitignore | 0 .../entry/build-profile.json5 | 0 .../{shopping => application}/entry/hvigorfile.ts | 0 .../entry/obfuscation-rules.txt | 0 .../entry/oh-package.json5 | 0 .../src/main/ets/entryability/EntryAbility.ets | 0 .../ets/entrybackupability/EntryBackupAbility.ets | 0 .../entry/src/main/ets/pages/Index.ets | 0 .../src/main/ets/resources/common/achievement.png | Bin .../src/main/ets/resources/common/activity.png | Bin .../entry/src/main/ets/resources/common/bgImg.png | Bin .../entry/src/main/ets/resources/common/gift.png | Bin .../entry/src/main/ets/resources/common/our.png | Bin .../entry/src/main/ets/resources/common/person.png | Bin .../entry/src/main/ets/resources/common/sales.png | Bin .../entry/src/main/ets/resources/common/user.png | Bin .../resources/detailImg/deliver/deliver_logo1.png | Bin .../resources/detailImg/deliver/deliver_logo3.png | Bin .../resources/detailImg/deliver/deliver_type1.png | Bin .../resources/detailImg/deliver/deliver_type2.png | Bin .../resources/detailImg/deliver/deliver_type3.png | Bin .../resources/detailImg/deliver/deliver_type5.png | Bin .../resources/detailImg/evaluation/buyersShow1.png | Bin .../resources/detailImg/evaluation/buyersShow2.png | Bin .../resources/detailImg/evaluation/buyersShow3.png | Bin .../resources/detailImg/evaluation/buyersShow4.png | Bin .../detailImg/evaluation/evaluation_logo.jpg | Bin .../detailImg/evaluation/evaluation_logo1.png | Bin .../detailImg/evaluation/evaluation_logo2.png | Bin .../detailImg/evaluation/evaluation_logo3.png | Bin .../detailImg/recommendImg/attention/list_1.png | Bin .../detailImg/recommendImg/attention/list_2.png | Bin .../detailImg/recommendImg/attention/list_3.png | Bin .../detailImg/recommendImg/attention/list_4.png | Bin .../detailImg/recommendImg/attention/list_5.png | Bin .../detailImg/recommendImg/attention/list_6.png | Bin .../recommendImg/recommendImg/recommendImg1.png | Bin .../recommendImg/recommendImg/recommendImg10.png | Bin .../recommendImg/recommendImg/recommendImg2.png | Bin .../recommendImg/recommendImg/recommendImg3.png | Bin .../recommendImg/recommendImg/recommendImg4.png | Bin .../recommendImg/recommendImg/recommendImg5.png | Bin .../recommendImg/recommendImg/recommendImg6.png | Bin .../recommendImg/recommendImg/recommendImg7.png | Bin .../recommendImg/recommendImg/recommendImg8.png | Bin .../recommendImg/recommendImg/recommendImg9.png | Bin .../main/ets/resources/detailImg/swiper/swiper1.png | Bin .../main/ets/resources/detailImg/swiper/swiper2.png | Bin .../main/ets/resources/detailImg/swiper/swiper3.png | Bin .../main/ets/resources/detailImg/swiper/swiper4.png | Bin .../main/ets/resources/homeImg/banner/banner1.jpg | Bin .../main/ets/resources/homeImg/banner/banner2.jpg | Bin .../src/main/ets/resources/homeImg/boutique/1.png | Bin .../src/main/ets/resources/homeImg/boutique/10.png | Bin .../src/main/ets/resources/homeImg/boutique/11.png | Bin .../src/main/ets/resources/homeImg/boutique/12.png | Bin .../src/main/ets/resources/homeImg/boutique/2.png | Bin .../src/main/ets/resources/homeImg/boutique/3.png | Bin .../src/main/ets/resources/homeImg/boutique/4.png | Bin .../src/main/ets/resources/homeImg/boutique/5.png | Bin .../src/main/ets/resources/homeImg/boutique/6.png | Bin .../src/main/ets/resources/homeImg/boutique/7.png | Bin .../src/main/ets/resources/homeImg/boutique/8.png | Bin .../src/main/ets/resources/homeImg/boutique/9.png | Bin .../src/main/ets/resources/homeImg/core/core1.png | Bin .../src/main/ets/resources/homeImg/core/core10.png | Bin .../src/main/ets/resources/homeImg/core/core11.png | Bin .../src/main/ets/resources/homeImg/core/core12.png | Bin .../src/main/ets/resources/homeImg/core/core13.png | Bin .../src/main/ets/resources/homeImg/core/core14.png | Bin .../src/main/ets/resources/homeImg/core/core15.png | Bin .../src/main/ets/resources/homeImg/core/core16.png | Bin .../src/main/ets/resources/homeImg/core/core17.png | Bin .../src/main/ets/resources/homeImg/core/core18.png | Bin .../src/main/ets/resources/homeImg/core/core19.png | Bin .../src/main/ets/resources/homeImg/core/core2.png | Bin .../src/main/ets/resources/homeImg/core/core3.png | Bin .../src/main/ets/resources/homeImg/core/core4.png | Bin .../src/main/ets/resources/homeImg/core/core5.png | Bin .../src/main/ets/resources/homeImg/core/core6.png | Bin .../src/main/ets/resources/homeImg/core/core7.png | Bin .../src/main/ets/resources/homeImg/core/core8.png | Bin .../src/main/ets/resources/homeImg/core/core9.png | Bin .../ets/resources/homeImg/imgLoads/product001.png | Bin .../ets/resources/homeImg/imgLoads/product002.png | Bin .../ets/resources/homeImg/imgLoads/product003.png | Bin .../ets/resources/homeImg/imgLoads/product004.png | Bin .../ets/resources/homeImg/imgLoads/product005.png | Bin .../ets/resources/homeImg/imgLoads/product006.png | Bin .../ets/resources/homeImg/imgLoads/product007.png | Bin .../ets/resources/homeImg/imgLoads/product008.png | Bin .../ets/resources/homeImg/imgLoads/product009.png | Bin .../ets/resources/homeImg/imgLoads/product010.png | Bin .../ets/resources/homeImg/imgLoads/product011.png | Bin .../ets/resources/homeImg/imgLoads/product012.png | Bin .../ets/resources/homeImg/imgLoads/product013.png | Bin .../ets/resources/homeImg/imgLoads/product014.png | Bin .../src/main/ets/resources/homeImg/tabIcon/cart.png | Bin .../ets/resources/homeImg/tabIcon/cartSelected.png | Bin .../resources/homeImg/tabIcon/classification.png | Bin .../homeImg/tabIcon/classificationSelected.png | Bin .../src/main/ets/resources/homeImg/tabIcon/find.png | Bin .../ets/resources/homeImg/tabIcon/findSelected.png | Bin .../src/main/ets/resources/homeImg/tabIcon/home.png | Bin .../ets/resources/homeImg/tabIcon/homeSelected.png | Bin .../src/main/ets/resources/homeImg/tabIcon/user.png | Bin .../ets/resources/homeImg/tabIcon/userSelected.png | Bin .../src/main/ets/resources/icon/arrow_left.png | Bin .../src/main/ets/resources/icon/arrow_right.png | Bin .../entry/src/main/ets/resources/icon/attention.png | Bin .../entry/src/main/ets/resources/icon/back.png | Bin .../entry/src/main/ets/resources/icon/barcode.png | Bin .../entry/src/main/ets/resources/icon/camera.png | Bin .../entry/src/main/ets/resources/icon/code.png | Bin .../entry/src/main/ets/resources/icon/collect.png | Bin .../entry/src/main/ets/resources/icon/collected.png | Bin .../entry/src/main/ets/resources/icon/comments.png | Bin .../entry/src/main/ets/resources/icon/down.png | Bin .../entry/src/main/ets/resources/icon/edit.png | Bin .../entry/src/main/ets/resources/icon/game.png | Bin .../entry/src/main/ets/resources/icon/heart.png | Bin .../entry/src/main/ets/resources/icon/hearted.png | Bin .../entry/src/main/ets/resources/icon/hide.png | Bin .../entry/src/main/ets/resources/icon/highlight.png | Bin .../entry/src/main/ets/resources/icon/install.png | Bin .../entry/src/main/ets/resources/icon/layout.png | Bin .../entry/src/main/ets/resources/icon/like.png | Bin .../entry/src/main/ets/resources/icon/local.png | Bin .../entry/src/main/ets/resources/icon/many.png | Bin .../entry/src/main/ets/resources/icon/more.png | Bin .../main/ets/resources/icon/nav_classification.png | Bin .../entry/src/main/ets/resources/icon/phoneCall.png | Bin .../src/main/ets/resources/icon/promotions.png | Bin .../entry/src/main/ets/resources/icon/ring.png | Bin .../entry/src/main/ets/resources/icon/save.png | Bin .../entry/src/main/ets/resources/icon/scan.png | Bin .../entry/src/main/ets/resources/icon/search.png | Bin .../entry/src/main/ets/resources/icon/setting.png | Bin .../entry/src/main/ets/resources/icon/share.png | Bin .../entry/src/main/ets/resources/icon/show.png | Bin .../entry/src/main/ets/resources/icon/smile.png | Bin .../entry/src/main/ets/resources/icon/sort-down.png | Bin .../entry/src/main/ets/resources/icon/up.png | Bin .../entry/src/main/ets/resources/icon/voice.png | Bin .../entry/src/main/module.json5 | 0 .../src/main/resources/base/element/color.json | 0 .../src/main/resources/base/element/string.json | 0 .../src/main/resources/base/media/background.png | Bin .../src/main/resources/base/media/foreground.png | Bin .../main/resources/base/media/layered_image.json | 0 .../src/main/resources/base/media/startIcon.png | Bin .../main/resources/base/profile/backup_config.json | 0 .../src/main/resources/base/profile/main_pages.json | 0 .../src/main/resources/en_US/element/string.json | 0 .../src/main/resources/zh_CN/element/string.json | 0 .../entry/src/mock/mock-config.json5 | 0 .../entry/src/ohosTest/ets/test/Ability.test.ets | 0 .../entry/src/ohosTest/ets/test/List.test.ets | 0 .../entry/src/ohosTest/module.json5 | 0 .../entry/src/test/List.test.ets | 0 .../entry/src/test/LocalUnit.test.ets | 0 .../hvigor/hvigor-config.json5 | 0 .../{shopping => application}/hvigorfile.ts | 0 .../{shopping => application}/local.properties | 0 .../{shopping => application}/oh-package-lock.json5 | 0 .../{shopping => application}/oh-package.json5 | 0 arkoala-arkts/shopping/package.json | 12 +++++++----- arkoala-arkts/shopping/user/package.json | 12 ++++++------ .../{trivial => application}/AppScope/app.json5 | 0 .../AppScope/resources/base/element/string.json | 0 .../AppScope/resources/base/media/app_icon.png | Bin .../{trivial => application}/build-profile.json5 | 0 .../{trivial => application}/code-linter.json5 | 0 .../{trivial => application}/entry/.gitignore | 0 .../entry/build-profile.json5 | 0 .../{trivial => application}/entry/hvigorfile.ts | 0 .../entry/obfuscation-rules.txt | 0 .../{trivial => application}/entry/oh-package.json5 | 0 .../src/main/ets/entryability/EntryAbility.ets | 0 .../ets/entrybackupability/EntryBackupAbility.ets | 0 .../entry/src/main/ets/pages/Index.ets | 0 .../entry/src/main/module.json5 | 0 .../src/main/resources/base/element/color.json | 0 .../src/main/resources/base/element/string.json | 0 .../src/main/resources/base/media/background.png | Bin .../src/main/resources/base/media/foreground.png | Bin .../main/resources/base/media/layered_image.json | 0 .../src/main/resources/base/media/startIcon.png | Bin .../main/resources/base/profile/backup_config.json | 0 .../src/main/resources/base/profile/main_pages.json | 0 .../src/main/resources/en_US/element/string.json | 0 .../src/main/resources/zh_CN/element/string.json | 0 .../entry/src/mock/mock-config.json5 | 0 .../entry/src/ohosTest/ets/test/Ability.test.ets | 0 .../entry/src/ohosTest/ets/test/List.test.ets | 0 .../entry/src/ohosTest/module.json5 | 0 .../entry/src/test/List.test.ets | 0 .../entry/src/test/LocalUnit.test.ets | 0 .../hvigor/hvigor-config.json5 | 0 .../trivial/{trivial => application}/hvigorfile.ts | 0 .../{trivial => application}/local.properties | 0 .../{trivial => application}/oh-package-lock.json5 | 0 .../{trivial => application}/oh-package.json5 | 0 arkoala-arkts/trivial/package.json | 12 +++++++----- arkoala-arkts/trivial/user/package.json | 12 ++++++------ incremental/tools/panda/package.json | 2 +- 248 files changed, 40 insertions(+), 34 deletions(-) rename arkoala-arkts/navigation/{navigation => application}/AppScope/app.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/AppScope/resources/base/element/string.json (100%) rename arkoala-arkts/navigation/{navigation => application}/AppScope/resources/base/media/app_icon.png (100%) rename arkoala-arkts/navigation/{navigation => application}/build-profile.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/code-linter.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/.gitignore (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/build-profile.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/hvigorfile.ts (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/obfuscation-rules.txt (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/oh-package.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/ets/entryability/EntryAbility.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/ets/pages/Index.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/module.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/element/color.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/element/string.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/media/background.png (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/media/foreground.png (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/media/layered_image.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/media/startIcon.png (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/profile/backup_config.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/base/profile/main_pages.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/en_US/element/string.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/main/resources/zh_CN/element/string.json (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/mock/mock-config.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/ohosTest/ets/test/Ability.test.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/ohosTest/ets/test/List.test.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/ohosTest/module.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/test/List.test.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/entry/src/test/LocalUnit.test.ets (100%) rename arkoala-arkts/navigation/{navigation => application}/hvigor/hvigor-config.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/hvigorfile.ts (100%) rename arkoala-arkts/navigation/{navigation => application}/local.properties (100%) rename arkoala-arkts/navigation/{navigation => application}/oh-package-lock.json5 (100%) rename arkoala-arkts/navigation/{navigation => application}/oh-package.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/AppScope/app.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/AppScope/resources/base/element/string.json (100%) rename arkoala-arkts/shopping/{shopping => application}/AppScope/resources/base/media/app_icon.png (100%) rename arkoala-arkts/shopping/{shopping => application}/build-profile.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/code-linter.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/.gitignore (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/build-profile.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/hvigorfile.ts (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/obfuscation-rules.txt (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/oh-package.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/entryability/EntryAbility.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/pages/Index.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/achievement.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/activity.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/bgImg.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/gift.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/our.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/person.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/sales.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/common/user.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/deliver/deliver_logo1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/deliver/deliver_logo3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/deliver/deliver_type1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/deliver/deliver_type2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/deliver/deliver_type3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/deliver/deliver_type5.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/buyersShow1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/buyersShow2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/buyersShow3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/buyersShow4.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo.jpg (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_4.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_5.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_6.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg10.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg4.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg5.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg6.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg7.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg8.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg9.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/swiper/swiper1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/swiper/swiper2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/swiper/swiper3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/detailImg/swiper/swiper4.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/banner/banner1.jpg (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/banner/banner2.jpg (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/10.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/11.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/12.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/4.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/5.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/6.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/7.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/8.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/boutique/9.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core1.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core10.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core11.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core12.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core13.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core14.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core15.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core16.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core17.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core18.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core19.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core2.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core3.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core4.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core5.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core6.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core7.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core8.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/core/core9.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product001.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product002.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product003.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product004.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product005.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product006.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product007.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product008.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product009.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product010.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product011.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product012.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product013.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/imgLoads/product014.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/cart.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/cartSelected.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/classification.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/classificationSelected.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/find.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/findSelected.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/home.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/homeSelected.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/user.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/homeImg/tabIcon/userSelected.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/arrow_left.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/arrow_right.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/attention.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/back.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/barcode.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/camera.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/code.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/collect.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/collected.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/comments.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/down.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/edit.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/game.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/heart.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/hearted.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/hide.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/highlight.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/install.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/layout.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/like.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/local.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/many.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/more.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/nav_classification.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/phoneCall.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/promotions.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/ring.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/save.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/scan.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/search.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/setting.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/share.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/show.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/smile.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/sort-down.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/up.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/ets/resources/icon/voice.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/module.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/element/color.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/element/string.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/media/background.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/media/foreground.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/media/layered_image.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/media/startIcon.png (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/profile/backup_config.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/base/profile/main_pages.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/en_US/element/string.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/main/resources/zh_CN/element/string.json (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/mock/mock-config.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/ohosTest/ets/test/Ability.test.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/ohosTest/ets/test/List.test.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/ohosTest/module.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/test/List.test.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/entry/src/test/LocalUnit.test.ets (100%) rename arkoala-arkts/shopping/{shopping => application}/hvigor/hvigor-config.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/hvigorfile.ts (100%) rename arkoala-arkts/shopping/{shopping => application}/local.properties (100%) rename arkoala-arkts/shopping/{shopping => application}/oh-package-lock.json5 (100%) rename arkoala-arkts/shopping/{shopping => application}/oh-package.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/AppScope/app.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/AppScope/resources/base/element/string.json (100%) rename arkoala-arkts/trivial/{trivial => application}/AppScope/resources/base/media/app_icon.png (100%) rename arkoala-arkts/trivial/{trivial => application}/build-profile.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/code-linter.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/.gitignore (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/build-profile.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/hvigorfile.ts (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/obfuscation-rules.txt (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/oh-package.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/ets/entryability/EntryAbility.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/ets/pages/Index.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/module.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/element/color.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/element/string.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/media/background.png (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/media/foreground.png (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/media/layered_image.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/media/startIcon.png (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/profile/backup_config.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/base/profile/main_pages.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/en_US/element/string.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/main/resources/zh_CN/element/string.json (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/mock/mock-config.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/ohosTest/ets/test/Ability.test.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/ohosTest/ets/test/List.test.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/ohosTest/module.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/test/List.test.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/entry/src/test/LocalUnit.test.ets (100%) rename arkoala-arkts/trivial/{trivial => application}/hvigor/hvigor-config.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/hvigorfile.ts (100%) rename arkoala-arkts/trivial/{trivial => application}/local.properties (100%) rename arkoala-arkts/trivial/{trivial => application}/oh-package-lock.json5 (100%) rename arkoala-arkts/trivial/{trivial => application}/oh-package.json5 (100%) diff --git a/arkoala-arkts/navigation/navigation/AppScope/app.json5 b/arkoala-arkts/navigation/application/AppScope/app.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/AppScope/app.json5 rename to arkoala-arkts/navigation/application/AppScope/app.json5 diff --git a/arkoala-arkts/navigation/navigation/AppScope/resources/base/element/string.json b/arkoala-arkts/navigation/application/AppScope/resources/base/element/string.json similarity index 100% rename from arkoala-arkts/navigation/navigation/AppScope/resources/base/element/string.json rename to arkoala-arkts/navigation/application/AppScope/resources/base/element/string.json diff --git a/arkoala-arkts/navigation/navigation/AppScope/resources/base/media/app_icon.png b/arkoala-arkts/navigation/application/AppScope/resources/base/media/app_icon.png similarity index 100% rename from arkoala-arkts/navigation/navigation/AppScope/resources/base/media/app_icon.png rename to arkoala-arkts/navigation/application/AppScope/resources/base/media/app_icon.png diff --git a/arkoala-arkts/navigation/navigation/build-profile.json5 b/arkoala-arkts/navigation/application/build-profile.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/build-profile.json5 rename to arkoala-arkts/navigation/application/build-profile.json5 diff --git a/arkoala-arkts/navigation/navigation/code-linter.json5 b/arkoala-arkts/navigation/application/code-linter.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/code-linter.json5 rename to arkoala-arkts/navigation/application/code-linter.json5 diff --git a/arkoala-arkts/navigation/navigation/entry/.gitignore b/arkoala-arkts/navigation/application/entry/.gitignore similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/.gitignore rename to arkoala-arkts/navigation/application/entry/.gitignore diff --git a/arkoala-arkts/navigation/navigation/entry/build-profile.json5 b/arkoala-arkts/navigation/application/entry/build-profile.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/build-profile.json5 rename to arkoala-arkts/navigation/application/entry/build-profile.json5 diff --git a/arkoala-arkts/navigation/navigation/entry/hvigorfile.ts b/arkoala-arkts/navigation/application/entry/hvigorfile.ts similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/hvigorfile.ts rename to arkoala-arkts/navigation/application/entry/hvigorfile.ts diff --git a/arkoala-arkts/navigation/navigation/entry/obfuscation-rules.txt b/arkoala-arkts/navigation/application/entry/obfuscation-rules.txt similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/obfuscation-rules.txt rename to arkoala-arkts/navigation/application/entry/obfuscation-rules.txt diff --git a/arkoala-arkts/navigation/navigation/entry/oh-package.json5 b/arkoala-arkts/navigation/application/entry/oh-package.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/oh-package.json5 rename to arkoala-arkts/navigation/application/entry/oh-package.json5 diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/ets/entryability/EntryAbility.ets b/arkoala-arkts/navigation/application/entry/src/main/ets/entryability/EntryAbility.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/ets/entryability/EntryAbility.ets rename to arkoala-arkts/navigation/application/entry/src/main/ets/entryability/EntryAbility.ets diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/arkoala-arkts/navigation/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to arkoala-arkts/navigation/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/ets/pages/Index.ets b/arkoala-arkts/navigation/application/entry/src/main/ets/pages/Index.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/ets/pages/Index.ets rename to arkoala-arkts/navigation/application/entry/src/main/ets/pages/Index.ets diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/module.json5 b/arkoala-arkts/navigation/application/entry/src/main/module.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/module.json5 rename to arkoala-arkts/navigation/application/entry/src/main/module.json5 diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/element/color.json b/arkoala-arkts/navigation/application/entry/src/main/resources/base/element/color.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/element/color.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/element/color.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/element/string.json b/arkoala-arkts/navigation/application/entry/src/main/resources/base/element/string.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/element/string.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/element/string.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/background.png b/arkoala-arkts/navigation/application/entry/src/main/resources/base/media/background.png similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/background.png rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/media/background.png diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/foreground.png b/arkoala-arkts/navigation/application/entry/src/main/resources/base/media/foreground.png similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/foreground.png rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/media/foreground.png diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/layered_image.json b/arkoala-arkts/navigation/application/entry/src/main/resources/base/media/layered_image.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/layered_image.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/media/layered_image.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/startIcon.png b/arkoala-arkts/navigation/application/entry/src/main/resources/base/media/startIcon.png similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/media/startIcon.png rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/media/startIcon.png diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/profile/backup_config.json b/arkoala-arkts/navigation/application/entry/src/main/resources/base/profile/backup_config.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/profile/backup_config.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/profile/backup_config.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/base/profile/main_pages.json b/arkoala-arkts/navigation/application/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/base/profile/main_pages.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/base/profile/main_pages.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/en_US/element/string.json b/arkoala-arkts/navigation/application/entry/src/main/resources/en_US/element/string.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/en_US/element/string.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/en_US/element/string.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/main/resources/zh_CN/element/string.json b/arkoala-arkts/navigation/application/entry/src/main/resources/zh_CN/element/string.json similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/main/resources/zh_CN/element/string.json rename to arkoala-arkts/navigation/application/entry/src/main/resources/zh_CN/element/string.json diff --git a/arkoala-arkts/navigation/navigation/entry/src/mock/mock-config.json5 b/arkoala-arkts/navigation/application/entry/src/mock/mock-config.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/mock/mock-config.json5 rename to arkoala-arkts/navigation/application/entry/src/mock/mock-config.json5 diff --git a/arkoala-arkts/navigation/navigation/entry/src/ohosTest/ets/test/Ability.test.ets b/arkoala-arkts/navigation/application/entry/src/ohosTest/ets/test/Ability.test.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/ohosTest/ets/test/Ability.test.ets rename to arkoala-arkts/navigation/application/entry/src/ohosTest/ets/test/Ability.test.ets diff --git a/arkoala-arkts/navigation/navigation/entry/src/ohosTest/ets/test/List.test.ets b/arkoala-arkts/navigation/application/entry/src/ohosTest/ets/test/List.test.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/ohosTest/ets/test/List.test.ets rename to arkoala-arkts/navigation/application/entry/src/ohosTest/ets/test/List.test.ets diff --git a/arkoala-arkts/navigation/navigation/entry/src/ohosTest/module.json5 b/arkoala-arkts/navigation/application/entry/src/ohosTest/module.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/ohosTest/module.json5 rename to arkoala-arkts/navigation/application/entry/src/ohosTest/module.json5 diff --git a/arkoala-arkts/navigation/navigation/entry/src/test/List.test.ets b/arkoala-arkts/navigation/application/entry/src/test/List.test.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/test/List.test.ets rename to arkoala-arkts/navigation/application/entry/src/test/List.test.ets diff --git a/arkoala-arkts/navigation/navigation/entry/src/test/LocalUnit.test.ets b/arkoala-arkts/navigation/application/entry/src/test/LocalUnit.test.ets similarity index 100% rename from arkoala-arkts/navigation/navigation/entry/src/test/LocalUnit.test.ets rename to arkoala-arkts/navigation/application/entry/src/test/LocalUnit.test.ets diff --git a/arkoala-arkts/navigation/navigation/hvigor/hvigor-config.json5 b/arkoala-arkts/navigation/application/hvigor/hvigor-config.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/hvigor/hvigor-config.json5 rename to arkoala-arkts/navigation/application/hvigor/hvigor-config.json5 diff --git a/arkoala-arkts/navigation/navigation/hvigorfile.ts b/arkoala-arkts/navigation/application/hvigorfile.ts similarity index 100% rename from arkoala-arkts/navigation/navigation/hvigorfile.ts rename to arkoala-arkts/navigation/application/hvigorfile.ts diff --git a/arkoala-arkts/navigation/navigation/local.properties b/arkoala-arkts/navigation/application/local.properties similarity index 100% rename from arkoala-arkts/navigation/navigation/local.properties rename to arkoala-arkts/navigation/application/local.properties diff --git a/arkoala-arkts/navigation/navigation/oh-package-lock.json5 b/arkoala-arkts/navigation/application/oh-package-lock.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/oh-package-lock.json5 rename to arkoala-arkts/navigation/application/oh-package-lock.json5 diff --git a/arkoala-arkts/navigation/navigation/oh-package.json5 b/arkoala-arkts/navigation/application/oh-package.json5 similarity index 100% rename from arkoala-arkts/navigation/navigation/oh-package.json5 rename to arkoala-arkts/navigation/application/oh-package.json5 diff --git a/arkoala-arkts/navigation/package.json b/arkoala-arkts/navigation/package.json index ac502821c..2f79c0ee4 100644 --- a/arkoala-arkts/navigation/package.json +++ b/arkoala-arkts/navigation/package.json @@ -3,7 +3,9 @@ "version": "1.4.1", "description": "", "scripts": { - "clean": "rimraf navigation/entry/build navigation/generated navigation/oh_modules navigation/.hvigor", + "clean": "rimraf application/entry/build application/generated application/oh_modules application/.hvigor", + "clean:user": "npm run clean --prefix ./user", + "clean:all": "npm run clean && npm run clean:user", "ets-plugin": "npm run arkoala:plugin --prefix ../../..", @@ -15,11 +17,11 @@ "user:har:arm64": "npm run har-arm64 --prefix ./user", "user:har:universal": "npm run har-universal --prefix ./user", - "install": "cd navigation && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build --install-ohpm-deps-only", - "build": "cd navigation && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build", + "install": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build --install-ohpm-deps-only", + "build": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build", "rebuild": "npm run clean && npm run build", - "sign": "cd navigation && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-sign", - "exec": "cd navigation && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-exec -i -r", + "sign": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-sign", + "exec": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-exec -i -r", "launch": "npm run install && npm run build && npm run sign && npm run exec", "relaunch": "npm run clean && npm run launch", diff --git a/arkoala-arkts/navigation/user/package.json b/arkoala-arkts/navigation/user/package.json index 11836c04d..0a2e47ee3 100644 --- a/arkoala-arkts/navigation/user/package.json +++ b/arkoala-arkts/navigation/user/package.json @@ -13,16 +13,16 @@ "unmemoize:all": "npm run unmemoize:runtime && npm run unmemoize:arkui-no-common && npm run unmemoize:arkui-common && npm run unmemoize", "build:user": "npm run unmemoize:all && npm run build:user:inc", "build:user:inc": "fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../../../incremental/tools/panda/arkts/arktsc --link-name user && ninja ${NINJA_OPTIONS} -f build/build.ninja", - "pack": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", + "pack": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", "har-arm32": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", "har-arm64": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", "har-universal": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har-universal.mjs --name user && npm run pack", - "cli-tools:chmod:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../command-line-tools/hvigor/bin -b 755", - "cli-tools:chmod:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../command-line-tools/hvigor/bin -b 755", - "cli-tools:download:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d command-line-tools && npm run cli-tools:chmod:bz", - "cli-tools:download:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs download -p deveco-tools -v 5.0.1300 -f deveco-tools.5.0.1300.zip -d command-line-tools && npm run cli-tools:chmod:yz", + "cli-tools:chmod:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../../command-line-tools/hvigor/bin -b 755", + "cli-tools:chmod:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../../command-line-tools/hvigor/bin -b 755", + "cli-tools:download:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d ../../command-line-tools && npm run cli-tools:chmod:bz", + "cli-tools:download:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs download -p deveco-tools -v 5.0.1300 -f deveco-tools.5.0.1300.zip -d ../../command-line-tools && npm run cli-tools:chmod:yz", "cli-tools:download": "test \"$KOALA_BZ\" = \"0\" && npm run cli-tools:download:yz || npm run cli-tools:download:bz", - "cli-tools:check": "test -d ../command-line-tools || npm run cli-tools:download" + "cli-tools:check": "test -d ../../command-line-tools || npm run cli-tools:download" } } diff --git a/arkoala-arkts/shopping/shopping/AppScope/app.json5 b/arkoala-arkts/shopping/application/AppScope/app.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/AppScope/app.json5 rename to arkoala-arkts/shopping/application/AppScope/app.json5 diff --git a/arkoala-arkts/shopping/shopping/AppScope/resources/base/element/string.json b/arkoala-arkts/shopping/application/AppScope/resources/base/element/string.json similarity index 100% rename from arkoala-arkts/shopping/shopping/AppScope/resources/base/element/string.json rename to arkoala-arkts/shopping/application/AppScope/resources/base/element/string.json diff --git a/arkoala-arkts/shopping/shopping/AppScope/resources/base/media/app_icon.png b/arkoala-arkts/shopping/application/AppScope/resources/base/media/app_icon.png similarity index 100% rename from arkoala-arkts/shopping/shopping/AppScope/resources/base/media/app_icon.png rename to arkoala-arkts/shopping/application/AppScope/resources/base/media/app_icon.png diff --git a/arkoala-arkts/shopping/shopping/build-profile.json5 b/arkoala-arkts/shopping/application/build-profile.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/build-profile.json5 rename to arkoala-arkts/shopping/application/build-profile.json5 diff --git a/arkoala-arkts/shopping/shopping/code-linter.json5 b/arkoala-arkts/shopping/application/code-linter.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/code-linter.json5 rename to arkoala-arkts/shopping/application/code-linter.json5 diff --git a/arkoala-arkts/shopping/shopping/entry/.gitignore b/arkoala-arkts/shopping/application/entry/.gitignore similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/.gitignore rename to arkoala-arkts/shopping/application/entry/.gitignore diff --git a/arkoala-arkts/shopping/shopping/entry/build-profile.json5 b/arkoala-arkts/shopping/application/entry/build-profile.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/build-profile.json5 rename to arkoala-arkts/shopping/application/entry/build-profile.json5 diff --git a/arkoala-arkts/shopping/shopping/entry/hvigorfile.ts b/arkoala-arkts/shopping/application/entry/hvigorfile.ts similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/hvigorfile.ts rename to arkoala-arkts/shopping/application/entry/hvigorfile.ts diff --git a/arkoala-arkts/shopping/shopping/entry/obfuscation-rules.txt b/arkoala-arkts/shopping/application/entry/obfuscation-rules.txt similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/obfuscation-rules.txt rename to arkoala-arkts/shopping/application/entry/obfuscation-rules.txt diff --git a/arkoala-arkts/shopping/shopping/entry/oh-package.json5 b/arkoala-arkts/shopping/application/entry/oh-package.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/oh-package.json5 rename to arkoala-arkts/shopping/application/entry/oh-package.json5 diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/entryability/EntryAbility.ets b/arkoala-arkts/shopping/application/entry/src/main/ets/entryability/EntryAbility.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/entryability/EntryAbility.ets rename to arkoala-arkts/shopping/application/entry/src/main/ets/entryability/EntryAbility.ets diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/arkoala-arkts/shopping/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to arkoala-arkts/shopping/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/pages/Index.ets b/arkoala-arkts/shopping/application/entry/src/main/ets/pages/Index.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/pages/Index.ets rename to arkoala-arkts/shopping/application/entry/src/main/ets/pages/Index.ets diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/achievement.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/achievement.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/achievement.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/achievement.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/activity.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/activity.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/activity.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/activity.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/bgImg.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/bgImg.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/bgImg.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/bgImg.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/gift.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/gift.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/gift.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/gift.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/our.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/our.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/our.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/our.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/person.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/person.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/person.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/person.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/sales.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/sales.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/sales.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/sales.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/user.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/user.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/common/user.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/common/user.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_logo1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_logo1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_logo1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_logo1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_logo3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_logo3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_logo3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_logo3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type5.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type5.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/deliver/deliver_type5.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/deliver/deliver_type5.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow4.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow4.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/buyersShow4.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/buyersShow4.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo.jpg b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo.jpg similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo.jpg rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo.jpg diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/evaluation/evaluation_logo3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_4.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_4.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_4.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_4.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_5.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_5.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_5.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_5.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_6.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_6.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_6.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/attention/list_6.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg10.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg10.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg10.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg10.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg4.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg4.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg4.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg4.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg5.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg5.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg5.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg5.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg6.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg6.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg6.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg6.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg7.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg7.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg7.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg7.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg8.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg8.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg8.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg8.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg9.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg9.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg9.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/recommendImg/recommendImg/recommendImg9.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper4.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper4.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/detailImg/swiper/swiper4.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/detailImg/swiper/swiper4.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/banner/banner1.jpg b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/banner/banner1.jpg similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/banner/banner1.jpg rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/banner/banner1.jpg diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/banner/banner2.jpg b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/banner/banner2.jpg similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/banner/banner2.jpg rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/banner/banner2.jpg diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/10.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/10.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/10.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/10.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/11.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/11.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/11.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/11.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/12.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/12.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/12.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/12.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/4.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/4.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/4.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/4.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/5.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/5.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/5.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/5.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/6.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/6.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/6.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/6.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/7.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/7.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/7.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/7.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/8.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/8.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/8.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/8.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/9.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/9.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/boutique/9.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/boutique/9.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core1.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core1.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core1.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core1.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core10.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core10.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core10.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core10.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core11.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core11.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core11.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core11.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core12.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core12.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core12.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core12.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core13.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core13.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core13.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core13.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core14.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core14.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core14.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core14.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core15.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core15.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core15.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core15.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core16.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core16.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core16.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core16.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core17.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core17.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core17.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core17.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core18.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core18.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core18.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core18.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core19.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core19.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core19.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core19.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core2.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core2.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core2.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core2.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core3.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core3.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core3.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core3.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core4.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core4.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core4.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core4.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core5.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core5.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core5.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core5.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core6.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core6.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core6.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core6.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core7.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core7.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core7.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core7.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core8.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core8.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core8.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core8.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core9.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core9.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/core/core9.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/core/core9.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product001.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product001.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product001.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product001.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product002.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product002.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product002.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product002.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product003.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product003.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product003.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product003.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product004.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product004.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product004.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product004.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product005.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product005.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product005.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product005.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product006.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product006.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product006.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product006.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product007.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product007.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product007.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product007.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product008.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product008.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product008.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product008.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product009.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product009.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product009.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product009.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product010.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product010.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product010.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product010.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product011.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product011.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product011.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product011.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product012.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product012.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product012.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product012.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product013.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product013.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product013.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product013.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product014.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product014.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/imgLoads/product014.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/imgLoads/product014.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/cart.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/cart.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/cart.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/cart.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/cartSelected.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/cartSelected.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/cartSelected.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/cartSelected.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/classification.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/classification.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/classification.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/classification.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/classificationSelected.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/classificationSelected.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/classificationSelected.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/classificationSelected.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/find.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/find.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/find.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/find.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/findSelected.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/findSelected.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/findSelected.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/findSelected.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/home.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/home.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/home.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/home.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/homeSelected.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/homeSelected.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/homeSelected.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/homeSelected.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/user.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/user.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/user.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/user.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/userSelected.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/userSelected.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/homeImg/tabIcon/userSelected.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/homeImg/tabIcon/userSelected.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/arrow_left.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/arrow_left.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/arrow_left.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/arrow_left.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/arrow_right.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/arrow_right.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/arrow_right.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/arrow_right.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/attention.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/attention.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/attention.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/attention.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/back.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/back.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/back.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/back.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/barcode.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/barcode.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/barcode.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/barcode.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/camera.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/camera.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/camera.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/camera.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/code.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/code.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/code.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/code.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/collect.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/collect.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/collect.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/collect.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/collected.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/collected.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/collected.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/collected.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/comments.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/comments.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/comments.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/comments.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/down.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/down.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/down.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/down.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/edit.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/edit.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/edit.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/edit.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/game.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/game.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/game.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/game.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/heart.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/heart.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/heart.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/heart.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/hearted.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/hearted.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/hearted.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/hearted.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/hide.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/hide.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/hide.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/hide.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/highlight.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/highlight.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/highlight.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/highlight.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/install.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/install.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/install.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/install.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/layout.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/layout.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/layout.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/layout.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/like.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/like.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/like.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/like.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/local.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/local.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/local.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/local.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/many.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/many.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/many.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/many.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/more.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/more.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/more.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/more.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/nav_classification.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/nav_classification.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/nav_classification.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/nav_classification.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/phoneCall.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/phoneCall.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/phoneCall.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/phoneCall.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/promotions.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/promotions.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/promotions.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/promotions.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/ring.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/ring.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/ring.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/ring.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/save.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/save.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/save.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/save.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/scan.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/scan.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/scan.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/scan.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/search.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/search.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/search.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/search.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/setting.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/setting.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/setting.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/setting.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/share.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/share.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/share.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/share.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/show.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/show.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/show.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/show.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/smile.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/smile.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/smile.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/smile.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/sort-down.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/sort-down.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/sort-down.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/sort-down.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/up.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/up.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/up.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/up.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/voice.png b/arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/voice.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/ets/resources/icon/voice.png rename to arkoala-arkts/shopping/application/entry/src/main/ets/resources/icon/voice.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/module.json5 b/arkoala-arkts/shopping/application/entry/src/main/module.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/module.json5 rename to arkoala-arkts/shopping/application/entry/src/main/module.json5 diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/element/color.json b/arkoala-arkts/shopping/application/entry/src/main/resources/base/element/color.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/element/color.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/element/color.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/element/string.json b/arkoala-arkts/shopping/application/entry/src/main/resources/base/element/string.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/element/string.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/element/string.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/background.png b/arkoala-arkts/shopping/application/entry/src/main/resources/base/media/background.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/background.png rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/media/background.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/foreground.png b/arkoala-arkts/shopping/application/entry/src/main/resources/base/media/foreground.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/foreground.png rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/media/foreground.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/layered_image.json b/arkoala-arkts/shopping/application/entry/src/main/resources/base/media/layered_image.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/layered_image.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/media/layered_image.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/startIcon.png b/arkoala-arkts/shopping/application/entry/src/main/resources/base/media/startIcon.png similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/media/startIcon.png rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/media/startIcon.png diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/profile/backup_config.json b/arkoala-arkts/shopping/application/entry/src/main/resources/base/profile/backup_config.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/profile/backup_config.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/profile/backup_config.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/base/profile/main_pages.json b/arkoala-arkts/shopping/application/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/base/profile/main_pages.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/base/profile/main_pages.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/en_US/element/string.json b/arkoala-arkts/shopping/application/entry/src/main/resources/en_US/element/string.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/en_US/element/string.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/en_US/element/string.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/main/resources/zh_CN/element/string.json b/arkoala-arkts/shopping/application/entry/src/main/resources/zh_CN/element/string.json similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/main/resources/zh_CN/element/string.json rename to arkoala-arkts/shopping/application/entry/src/main/resources/zh_CN/element/string.json diff --git a/arkoala-arkts/shopping/shopping/entry/src/mock/mock-config.json5 b/arkoala-arkts/shopping/application/entry/src/mock/mock-config.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/mock/mock-config.json5 rename to arkoala-arkts/shopping/application/entry/src/mock/mock-config.json5 diff --git a/arkoala-arkts/shopping/shopping/entry/src/ohosTest/ets/test/Ability.test.ets b/arkoala-arkts/shopping/application/entry/src/ohosTest/ets/test/Ability.test.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/ohosTest/ets/test/Ability.test.ets rename to arkoala-arkts/shopping/application/entry/src/ohosTest/ets/test/Ability.test.ets diff --git a/arkoala-arkts/shopping/shopping/entry/src/ohosTest/ets/test/List.test.ets b/arkoala-arkts/shopping/application/entry/src/ohosTest/ets/test/List.test.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/ohosTest/ets/test/List.test.ets rename to arkoala-arkts/shopping/application/entry/src/ohosTest/ets/test/List.test.ets diff --git a/arkoala-arkts/shopping/shopping/entry/src/ohosTest/module.json5 b/arkoala-arkts/shopping/application/entry/src/ohosTest/module.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/ohosTest/module.json5 rename to arkoala-arkts/shopping/application/entry/src/ohosTest/module.json5 diff --git a/arkoala-arkts/shopping/shopping/entry/src/test/List.test.ets b/arkoala-arkts/shopping/application/entry/src/test/List.test.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/test/List.test.ets rename to arkoala-arkts/shopping/application/entry/src/test/List.test.ets diff --git a/arkoala-arkts/shopping/shopping/entry/src/test/LocalUnit.test.ets b/arkoala-arkts/shopping/application/entry/src/test/LocalUnit.test.ets similarity index 100% rename from arkoala-arkts/shopping/shopping/entry/src/test/LocalUnit.test.ets rename to arkoala-arkts/shopping/application/entry/src/test/LocalUnit.test.ets diff --git a/arkoala-arkts/shopping/shopping/hvigor/hvigor-config.json5 b/arkoala-arkts/shopping/application/hvigor/hvigor-config.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/hvigor/hvigor-config.json5 rename to arkoala-arkts/shopping/application/hvigor/hvigor-config.json5 diff --git a/arkoala-arkts/shopping/shopping/hvigorfile.ts b/arkoala-arkts/shopping/application/hvigorfile.ts similarity index 100% rename from arkoala-arkts/shopping/shopping/hvigorfile.ts rename to arkoala-arkts/shopping/application/hvigorfile.ts diff --git a/arkoala-arkts/shopping/shopping/local.properties b/arkoala-arkts/shopping/application/local.properties similarity index 100% rename from arkoala-arkts/shopping/shopping/local.properties rename to arkoala-arkts/shopping/application/local.properties diff --git a/arkoala-arkts/shopping/shopping/oh-package-lock.json5 b/arkoala-arkts/shopping/application/oh-package-lock.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/oh-package-lock.json5 rename to arkoala-arkts/shopping/application/oh-package-lock.json5 diff --git a/arkoala-arkts/shopping/shopping/oh-package.json5 b/arkoala-arkts/shopping/application/oh-package.json5 similarity index 100% rename from arkoala-arkts/shopping/shopping/oh-package.json5 rename to arkoala-arkts/shopping/application/oh-package.json5 diff --git a/arkoala-arkts/shopping/package.json b/arkoala-arkts/shopping/package.json index 6367eec55..fbdb01998 100644 --- a/arkoala-arkts/shopping/package.json +++ b/arkoala-arkts/shopping/package.json @@ -3,7 +3,9 @@ "version": "1.4.1", "description": "", "scripts": { - "clean": "rimraf shopping/entry/build shopping/generated shopping/oh_modules shopping/.hvigor", + "clean": "rimraf application/entry/build application/generated application/oh_modules application/.hvigor", + "clean:user": "npm run clean --prefix ./user", + "clean:all": "npm run clean && npm run clean:user", "ets-plugin": "npm run arkoala:plugin --prefix ../..", @@ -15,11 +17,11 @@ "user:har:arm64": "npm run har-arm64 --prefix ./user", "user:har:universal": "npm run har-universal --prefix ./user", - "install": "cd shopping && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build --install-ohpm-deps-only", - "build": "cd shopping && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build", + "install": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build --install-ohpm-deps-only", + "build": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build", "rebuild": "npm run clean && npm run build", - "sign": "cd shopping && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-sign", - "exec": "cd shopping && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-exec -i -r", + "sign": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-sign", + "exec": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-exec -i -r", "launch": "npm run install && npm run build && npm run sign && npm run exec", "relaunch": "npm run clean && npm run launch", diff --git a/arkoala-arkts/shopping/user/package.json b/arkoala-arkts/shopping/user/package.json index 6489fe1fc..0a2e47ee3 100644 --- a/arkoala-arkts/shopping/user/package.json +++ b/arkoala-arkts/shopping/user/package.json @@ -13,16 +13,16 @@ "unmemoize:all": "npm run unmemoize:runtime && npm run unmemoize:arkui-no-common && npm run unmemoize:arkui-common && npm run unmemoize", "build:user": "npm run unmemoize:all && npm run build:user:inc", "build:user:inc": "fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../../../incremental/tools/panda/arkts/arktsc --link-name user && ninja ${NINJA_OPTIONS} -f build/build.ninja", - "pack": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", + "pack": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", "har-arm32": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", "har-arm64": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", "har-universal": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har-universal.mjs --name user && npm run pack", - "cli-tools:chmod:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../command-line-tools/hvigor/bin -b 755", - "cli-tools:chmod:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../command-line-tools/hvigor/bin -b 755", - "cli-tools:download:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d ../command-line-tools && npm run cli-tools:chmod:bz", - "cli-tools:download:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs download -p deveco-tools -v 5.0.1300 -f deveco-tools.5.0.1300.zip -d ../command-line-tools && npm run cli-tools:chmod:yz", + "cli-tools:chmod:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../../command-line-tools/hvigor/bin -b 755", + "cli-tools:chmod:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../../command-line-tools/hvigor/bin -b 755", + "cli-tools:download:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d ../../command-line-tools && npm run cli-tools:chmod:bz", + "cli-tools:download:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs download -p deveco-tools -v 5.0.1300 -f deveco-tools.5.0.1300.zip -d ../../command-line-tools && npm run cli-tools:chmod:yz", "cli-tools:download": "test \"$KOALA_BZ\" = \"0\" && npm run cli-tools:download:yz || npm run cli-tools:download:bz", - "cli-tools:check": "test -d ../command-line-tools || npm run cli-tools:download" + "cli-tools:check": "test -d ../../command-line-tools || npm run cli-tools:download" } } diff --git a/arkoala-arkts/trivial/trivial/AppScope/app.json5 b/arkoala-arkts/trivial/application/AppScope/app.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/AppScope/app.json5 rename to arkoala-arkts/trivial/application/AppScope/app.json5 diff --git a/arkoala-arkts/trivial/trivial/AppScope/resources/base/element/string.json b/arkoala-arkts/trivial/application/AppScope/resources/base/element/string.json similarity index 100% rename from arkoala-arkts/trivial/trivial/AppScope/resources/base/element/string.json rename to arkoala-arkts/trivial/application/AppScope/resources/base/element/string.json diff --git a/arkoala-arkts/trivial/trivial/AppScope/resources/base/media/app_icon.png b/arkoala-arkts/trivial/application/AppScope/resources/base/media/app_icon.png similarity index 100% rename from arkoala-arkts/trivial/trivial/AppScope/resources/base/media/app_icon.png rename to arkoala-arkts/trivial/application/AppScope/resources/base/media/app_icon.png diff --git a/arkoala-arkts/trivial/trivial/build-profile.json5 b/arkoala-arkts/trivial/application/build-profile.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/build-profile.json5 rename to arkoala-arkts/trivial/application/build-profile.json5 diff --git a/arkoala-arkts/trivial/trivial/code-linter.json5 b/arkoala-arkts/trivial/application/code-linter.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/code-linter.json5 rename to arkoala-arkts/trivial/application/code-linter.json5 diff --git a/arkoala-arkts/trivial/trivial/entry/.gitignore b/arkoala-arkts/trivial/application/entry/.gitignore similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/.gitignore rename to arkoala-arkts/trivial/application/entry/.gitignore diff --git a/arkoala-arkts/trivial/trivial/entry/build-profile.json5 b/arkoala-arkts/trivial/application/entry/build-profile.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/build-profile.json5 rename to arkoala-arkts/trivial/application/entry/build-profile.json5 diff --git a/arkoala-arkts/trivial/trivial/entry/hvigorfile.ts b/arkoala-arkts/trivial/application/entry/hvigorfile.ts similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/hvigorfile.ts rename to arkoala-arkts/trivial/application/entry/hvigorfile.ts diff --git a/arkoala-arkts/trivial/trivial/entry/obfuscation-rules.txt b/arkoala-arkts/trivial/application/entry/obfuscation-rules.txt similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/obfuscation-rules.txt rename to arkoala-arkts/trivial/application/entry/obfuscation-rules.txt diff --git a/arkoala-arkts/trivial/trivial/entry/oh-package.json5 b/arkoala-arkts/trivial/application/entry/oh-package.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/oh-package.json5 rename to arkoala-arkts/trivial/application/entry/oh-package.json5 diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/ets/entryability/EntryAbility.ets b/arkoala-arkts/trivial/application/entry/src/main/ets/entryability/EntryAbility.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/ets/entryability/EntryAbility.ets rename to arkoala-arkts/trivial/application/entry/src/main/ets/entryability/EntryAbility.ets diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/arkoala-arkts/trivial/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to arkoala-arkts/trivial/application/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/ets/pages/Index.ets b/arkoala-arkts/trivial/application/entry/src/main/ets/pages/Index.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/ets/pages/Index.ets rename to arkoala-arkts/trivial/application/entry/src/main/ets/pages/Index.ets diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/module.json5 b/arkoala-arkts/trivial/application/entry/src/main/module.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/module.json5 rename to arkoala-arkts/trivial/application/entry/src/main/module.json5 diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/element/color.json b/arkoala-arkts/trivial/application/entry/src/main/resources/base/element/color.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/element/color.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/element/color.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/element/string.json b/arkoala-arkts/trivial/application/entry/src/main/resources/base/element/string.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/element/string.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/element/string.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/background.png b/arkoala-arkts/trivial/application/entry/src/main/resources/base/media/background.png similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/background.png rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/media/background.png diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/foreground.png b/arkoala-arkts/trivial/application/entry/src/main/resources/base/media/foreground.png similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/foreground.png rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/media/foreground.png diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/layered_image.json b/arkoala-arkts/trivial/application/entry/src/main/resources/base/media/layered_image.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/layered_image.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/media/layered_image.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/startIcon.png b/arkoala-arkts/trivial/application/entry/src/main/resources/base/media/startIcon.png similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/media/startIcon.png rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/media/startIcon.png diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/profile/backup_config.json b/arkoala-arkts/trivial/application/entry/src/main/resources/base/profile/backup_config.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/profile/backup_config.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/profile/backup_config.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/base/profile/main_pages.json b/arkoala-arkts/trivial/application/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/base/profile/main_pages.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/base/profile/main_pages.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/en_US/element/string.json b/arkoala-arkts/trivial/application/entry/src/main/resources/en_US/element/string.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/en_US/element/string.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/en_US/element/string.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/main/resources/zh_CN/element/string.json b/arkoala-arkts/trivial/application/entry/src/main/resources/zh_CN/element/string.json similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/main/resources/zh_CN/element/string.json rename to arkoala-arkts/trivial/application/entry/src/main/resources/zh_CN/element/string.json diff --git a/arkoala-arkts/trivial/trivial/entry/src/mock/mock-config.json5 b/arkoala-arkts/trivial/application/entry/src/mock/mock-config.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/mock/mock-config.json5 rename to arkoala-arkts/trivial/application/entry/src/mock/mock-config.json5 diff --git a/arkoala-arkts/trivial/trivial/entry/src/ohosTest/ets/test/Ability.test.ets b/arkoala-arkts/trivial/application/entry/src/ohosTest/ets/test/Ability.test.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/ohosTest/ets/test/Ability.test.ets rename to arkoala-arkts/trivial/application/entry/src/ohosTest/ets/test/Ability.test.ets diff --git a/arkoala-arkts/trivial/trivial/entry/src/ohosTest/ets/test/List.test.ets b/arkoala-arkts/trivial/application/entry/src/ohosTest/ets/test/List.test.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/ohosTest/ets/test/List.test.ets rename to arkoala-arkts/trivial/application/entry/src/ohosTest/ets/test/List.test.ets diff --git a/arkoala-arkts/trivial/trivial/entry/src/ohosTest/module.json5 b/arkoala-arkts/trivial/application/entry/src/ohosTest/module.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/ohosTest/module.json5 rename to arkoala-arkts/trivial/application/entry/src/ohosTest/module.json5 diff --git a/arkoala-arkts/trivial/trivial/entry/src/test/List.test.ets b/arkoala-arkts/trivial/application/entry/src/test/List.test.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/test/List.test.ets rename to arkoala-arkts/trivial/application/entry/src/test/List.test.ets diff --git a/arkoala-arkts/trivial/trivial/entry/src/test/LocalUnit.test.ets b/arkoala-arkts/trivial/application/entry/src/test/LocalUnit.test.ets similarity index 100% rename from arkoala-arkts/trivial/trivial/entry/src/test/LocalUnit.test.ets rename to arkoala-arkts/trivial/application/entry/src/test/LocalUnit.test.ets diff --git a/arkoala-arkts/trivial/trivial/hvigor/hvigor-config.json5 b/arkoala-arkts/trivial/application/hvigor/hvigor-config.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/hvigor/hvigor-config.json5 rename to arkoala-arkts/trivial/application/hvigor/hvigor-config.json5 diff --git a/arkoala-arkts/trivial/trivial/hvigorfile.ts b/arkoala-arkts/trivial/application/hvigorfile.ts similarity index 100% rename from arkoala-arkts/trivial/trivial/hvigorfile.ts rename to arkoala-arkts/trivial/application/hvigorfile.ts diff --git a/arkoala-arkts/trivial/trivial/local.properties b/arkoala-arkts/trivial/application/local.properties similarity index 100% rename from arkoala-arkts/trivial/trivial/local.properties rename to arkoala-arkts/trivial/application/local.properties diff --git a/arkoala-arkts/trivial/trivial/oh-package-lock.json5 b/arkoala-arkts/trivial/application/oh-package-lock.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/oh-package-lock.json5 rename to arkoala-arkts/trivial/application/oh-package-lock.json5 diff --git a/arkoala-arkts/trivial/trivial/oh-package.json5 b/arkoala-arkts/trivial/application/oh-package.json5 similarity index 100% rename from arkoala-arkts/trivial/trivial/oh-package.json5 rename to arkoala-arkts/trivial/application/oh-package.json5 diff --git a/arkoala-arkts/trivial/package.json b/arkoala-arkts/trivial/package.json index 54ea8474b..fbdb01998 100644 --- a/arkoala-arkts/trivial/package.json +++ b/arkoala-arkts/trivial/package.json @@ -3,7 +3,9 @@ "version": "1.4.1", "description": "", "scripts": { - "clean": "rimraf trivial/entry/build trivial/generated trivial/oh_modules trivial/.hvigor", + "clean": "rimraf application/entry/build application/generated application/oh_modules application/.hvigor", + "clean:user": "npm run clean --prefix ./user", + "clean:all": "npm run clean && npm run clean:user", "ets-plugin": "npm run arkoala:plugin --prefix ../..", @@ -15,11 +17,11 @@ "user:har:arm64": "npm run har-arm64 --prefix ./user", "user:har:universal": "npm run har-universal --prefix ./user", - "install": "cd trivial && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build --install-ohpm-deps-only", - "build": "cd trivial && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build", + "install": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build --install-ohpm-deps-only", + "build": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-build", "rebuild": "npm run clean && npm run build", - "sign": "cd trivial && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-sign", - "exec": "cd trivial && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-exec -i -r", + "sign": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-sign", + "exec": "cd application && DEVECO_TOOLS_HOME=../../har/command-line-tools node ../../../arkoala/ohos-sdk/scripts/cli.mjs oh-exec -i -r", "launch": "npm run install && npm run build && npm run sign && npm run exec", "relaunch": "npm run clean && npm run launch", diff --git a/arkoala-arkts/trivial/user/package.json b/arkoala-arkts/trivial/user/package.json index d92b95543..88584266e 100644 --- a/arkoala-arkts/trivial/user/package.json +++ b/arkoala-arkts/trivial/user/package.json @@ -15,16 +15,16 @@ "build:user:inc": "fast-arktsc --input-files ./arktsconfig-run-unmemoized.json --output-dir ./build --compiler ../../../incremental/tools/panda/arkts/arktsc --link-name user && ninja ${NINJA_OPTIONS} -f build/build.ninja", "build:user:pure-sts": "npm run build:arkui:pure-sts --prefix ../../arkui && ../../../incremental/tools/panda/arkts/arktsc-capi --file src/sts/hello.sts --arktsconfig arktsconfig-pure-sts.json --output build/sts/abc/hello.abc --dump-plugin-ast", "run:user:pure-sts": "npm run build:user:pure-sts && ../../../incremental/tools/panda/arkts/ark build/sts/abc/hello.abc --ark-boot-files ../../arkui/build/sts/abc/src/sts/arkui.abc:build/sts/abc/hello.abc --ark-entry-point @ohos.example.src.sts.hello.ArkUIEntry::run", - "pack": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", + "pack": "npm run cli-tools:check && cd app && DEVECO_SDK_HOME=../../../../arkoala/ohos-sdk/ohos-sdk ../../../command-line-tools/hvigor/bin/hvigorw --no-daemon --mode module -p product=default -p module=user@default assembleHar", "har-arm32": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm32 && npm run pack", "har-arm64": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har.mjs --name user --arch arm64 && npm run pack", "har-universal": "npm run build:user && npm run --prefix ../../../arkoala/ohos-sdk download && node scripts/build-har-universal.mjs --name user && npm run pack", - "cli-tools:chmod:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../command-line-tools/hvigor/bin -b 755", - "cli-tools:chmod:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../command-line-tools/hvigor/bin -b 755", - "cli-tools:download:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d command-line-tools && npm run cli-tools:chmod:bz", - "cli-tools:download:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs download -p deveco-tools -v 5.0.1300 -f deveco-tools.5.0.1300.zip -d command-line-tools && npm run cli-tools:chmod:yz", + "cli-tools:chmod:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs chmod -p ../../command-line-tools/hvigor/bin -b 755", + "cli-tools:chmod:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../../command-line-tools/ohpm/bin -b 755 && node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs chmod -p ../../command-line-tools/hvigor/bin -b 755", + "cli-tools:download:bz": "node ../../../arkoala/ohos-sdk/scripts/openlab-cli.mjs download -p command-line-tools -v 5.0.3502 -f command-line-tools.5.0.3502.zip -d ../../command-line-tools && npm run cli-tools:chmod:bz", + "cli-tools:download:yz": "node ../../../arkoala/ohos-sdk/scripts/gitlab-cli.mjs download -p deveco-tools -v 5.0.1300 -f deveco-tools.5.0.1300.zip -d ../../command-line-tools && npm run cli-tools:chmod:yz", "cli-tools:download": "test \"$KOALA_BZ\" = \"0\" && npm run cli-tools:download:yz || npm run cli-tools:download:bz", - "cli-tools:check": "test -d ../command-line-tools || npm run cli-tools:download" + "cli-tools:check": "test -d ../../command-line-tools || npm run cli-tools:download" } } diff --git a/incremental/tools/panda/package.json b/incremental/tools/panda/package.json index 3c949db50..7e08dadf8 100644 --- a/incremental/tools/panda/package.json +++ b/incremental/tools/panda/package.json @@ -9,6 +9,6 @@ "panda:sdk:sync": "node ./sync-panda-on-device.mjs" }, "dependencies": { - "@panda/sdk": "^1.5.0-dev.17123" + "@panda/sdk": "^1.5.0-dev.17937" } } -- Gitee