diff --git a/app/oh/Vcoder/.gitignore b/src/apps/vcoder/.gitignore similarity index 100% rename from app/oh/Vcoder/.gitignore rename to src/apps/vcoder/.gitignore diff --git a/app/oh/Vcoder/AppScope/app.json5 b/src/apps/vcoder/AppScope/app.json5 similarity index 83% rename from app/oh/Vcoder/AppScope/app.json5 rename to src/apps/vcoder/AppScope/app.json5 index 61c2b03739..7b14e5ef5e 100644 --- a/app/oh/Vcoder/AppScope/app.json5 +++ b/src/apps/vcoder/AppScope/app.json5 @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.huawei.vcoder", + "bundleName": "com.huawei.BitFun", "vendor": "example", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/app/oh/Vcoder/AppScope/resources/base/element/string.json b/src/apps/vcoder/AppScope/resources/base/element/string.json similarity index 71% rename from app/oh/Vcoder/AppScope/resources/base/element/string.json rename to src/apps/vcoder/AppScope/resources/base/element/string.json index 7162e0a965..9678373bbd 100644 --- a/app/oh/Vcoder/AppScope/resources/base/element/string.json +++ b/src/apps/vcoder/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "Vcoder" + "value": "BitFun" } ] } diff --git a/app/oh/Vcoder/AppScope/resources/base/media/background.png b/src/apps/vcoder/AppScope/resources/base/media/background.png similarity index 100% rename from app/oh/Vcoder/AppScope/resources/base/media/background.png rename to src/apps/vcoder/AppScope/resources/base/media/background.png diff --git a/app/oh/Vcoder/AppScope/resources/base/media/foreground.png b/src/apps/vcoder/AppScope/resources/base/media/foreground.png similarity index 100% rename from app/oh/Vcoder/AppScope/resources/base/media/foreground.png rename to src/apps/vcoder/AppScope/resources/base/media/foreground.png diff --git a/app/oh/Vcoder/AppScope/resources/base/media/layered_image.json b/src/apps/vcoder/AppScope/resources/base/media/layered_image.json similarity index 100% rename from app/oh/Vcoder/AppScope/resources/base/media/layered_image.json rename to src/apps/vcoder/AppScope/resources/base/media/layered_image.json diff --git a/app/oh/Vcoder/build-profile.json5 b/src/apps/vcoder/build-profile.json5 similarity index 73% rename from app/oh/Vcoder/build-profile.json5 rename to src/apps/vcoder/build-profile.json5 index c792291def..074b9ce936 100644 --- a/app/oh/Vcoder/build-profile.json5 +++ b/src/apps/vcoder/build-profile.json5 @@ -5,13 +5,13 @@ "name": "default", "type": "HarmonyOS", "material": { - "certpath": "C:\\Users\\lijiale\\.ohos\\config\\default_Vcoder_imQPBwlDhZKHpu-LkgPseVnUO1DIbVYZGHwovJ97cvY=.cer", + "certpath": "C:\\Users\\lijiale\\.ohos\\config\\default_vcoder_mLoJ04E4ZMVs3NKJi5Yg30Rswoz227jnCV-I8k6sAvc=.cer", "keyAlias": "debugKey", - "keyPassword": "0000001B63A5404F339099984BDD616073E604D447C289B47D5DA41028E43A2E5D4DF2BE67AA24F4CD3464", - "profile": "C:\\Users\\lijiale\\.ohos\\config\\default_Vcoder_imQPBwlDhZKHpu-LkgPseVnUO1DIbVYZGHwovJ97cvY=.p7b", + "keyPassword": "0000001B1AC4E38D3159F409BFB38FF2B667CE1FE6E108A4C111EF2A0165222070DE0DE0656D86DB91D77C", + "profile": "C:\\Users\\lijiale\\.ohos\\config\\default_vcoder_mLoJ04E4ZMVs3NKJi5Yg30Rswoz227jnCV-I8k6sAvc=.p7b", "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\lijiale\\.ohos\\config\\default_Vcoder_imQPBwlDhZKHpu-LkgPseVnUO1DIbVYZGHwovJ97cvY=.p12", - "storePassword": "0000001B8D25281252401BEC116357BEDCA9ABEF740814063184A05219DA4399AB405785E0DFC726A24DA1" + "storeFile": "C:\\Users\\lijiale\\.ohos\\config\\default_vcoder_mLoJ04E4ZMVs3NKJi5Yg30Rswoz227jnCV-I8k6sAvc=.p12", + "storePassword": "0000001BF771363E57B97E663BB05D7EF3F6EA63ED750CF7C726306B8714BD0DF072E44D384B69C6FE4F64" } } ], diff --git a/app/oh/Vcoder/code-linter.json5 b/src/apps/vcoder/code-linter.json5 similarity index 100% rename from app/oh/Vcoder/code-linter.json5 rename to src/apps/vcoder/code-linter.json5 diff --git a/app/oh/Vcoder/entry/.gitignore b/src/apps/vcoder/entry/.gitignore similarity index 100% rename from app/oh/Vcoder/entry/.gitignore rename to src/apps/vcoder/entry/.gitignore diff --git a/app/oh/Vcoder/entry/build-profile.json5 b/src/apps/vcoder/entry/build-profile.json5 similarity index 100% rename from app/oh/Vcoder/entry/build-profile.json5 rename to src/apps/vcoder/entry/build-profile.json5 diff --git a/app/oh/Vcoder/entry/hvigorfile.ts b/src/apps/vcoder/entry/hvigorfile.ts similarity index 100% rename from app/oh/Vcoder/entry/hvigorfile.ts rename to src/apps/vcoder/entry/hvigorfile.ts diff --git a/app/oh/Vcoder/entry/obfuscation-rules.txt b/src/apps/vcoder/entry/obfuscation-rules.txt similarity index 100% rename from app/oh/Vcoder/entry/obfuscation-rules.txt rename to src/apps/vcoder/entry/obfuscation-rules.txt diff --git a/app/oh/Vcoder/entry/oh-package-lock.json5 b/src/apps/vcoder/entry/oh-package-lock.json5 similarity index 100% rename from app/oh/Vcoder/entry/oh-package-lock.json5 rename to src/apps/vcoder/entry/oh-package-lock.json5 diff --git a/app/oh/Vcoder/entry/oh-package.json5 b/src/apps/vcoder/entry/oh-package.json5 similarity index 100% rename from app/oh/Vcoder/entry/oh-package.json5 rename to src/apps/vcoder/entry/oh-package.json5 diff --git a/app/oh/Vcoder/entry/src/main/cpp/CMakeLists.txt b/src/apps/vcoder/entry/src/main/cpp/CMakeLists.txt similarity index 100% rename from app/oh/Vcoder/entry/src/main/cpp/CMakeLists.txt rename to src/apps/vcoder/entry/src/main/cpp/CMakeLists.txt diff --git a/app/oh/Vcoder/entry/src/main/cpp/napi_init.cpp b/src/apps/vcoder/entry/src/main/cpp/napi_init.cpp similarity index 100% rename from app/oh/Vcoder/entry/src/main/cpp/napi_init.cpp rename to src/apps/vcoder/entry/src/main/cpp/napi_init.cpp diff --git a/app/oh/Vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/Index.d.ts b/src/apps/vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/Index.d.ts similarity index 100% rename from app/oh/Vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/Index.d.ts rename to src/apps/vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/Index.d.ts diff --git a/app/oh/Vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/oh-package.json5 b/src/apps/vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/oh-package.json5 similarity index 100% rename from app/oh/Vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/oh-package.json5 rename to src/apps/vcoder/entry/src/main/cpp/types/libbitfun_desktop_lib/oh-package.json5 diff --git a/app/oh/Vcoder/entry/src/main/cpp/types/libentry/Index.d.ts b/src/apps/vcoder/entry/src/main/cpp/types/libentry/Index.d.ts similarity index 100% rename from app/oh/Vcoder/entry/src/main/cpp/types/libentry/Index.d.ts rename to src/apps/vcoder/entry/src/main/cpp/types/libentry/Index.d.ts diff --git a/app/oh/Vcoder/entry/src/main/cpp/types/libentry/oh-package.json5 b/src/apps/vcoder/entry/src/main/cpp/types/libentry/oh-package.json5 similarity index 100% rename from app/oh/Vcoder/entry/src/main/cpp/types/libentry/oh-package.json5 rename to src/apps/vcoder/entry/src/main/cpp/types/libentry/oh-package.json5 diff --git a/app/oh/Vcoder/entry/src/main/ets/entryability/EntryAbility.ets b/src/apps/vcoder/entry/src/main/ets/entryability/EntryAbility.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/entryability/EntryAbility.ets rename to src/apps/vcoder/entry/src/main/ets/entryability/EntryAbility.ets diff --git a/app/oh/Vcoder/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets b/src/apps/vcoder/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets rename to src/apps/vcoder/entry/src/main/ets/entrybackupability/EntryBackupAbility.ets diff --git a/app/oh/Vcoder/entry/src/main/ets/pages/Index.ets b/src/apps/vcoder/entry/src/main/ets/pages/Index.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/pages/Index.ets rename to src/apps/vcoder/entry/src/main/ets/pages/Index.ets diff --git a/app/oh/Vcoder/entry/src/main/ets/utils/CommonEventListener.ets b/src/apps/vcoder/entry/src/main/ets/utils/CommonEventListener.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/utils/CommonEventListener.ets rename to src/apps/vcoder/entry/src/main/ets/utils/CommonEventListener.ets diff --git a/app/oh/Vcoder/entry/src/main/ets/utils/CommonUtils.ets b/src/apps/vcoder/entry/src/main/ets/utils/CommonUtils.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/utils/CommonUtils.ets rename to src/apps/vcoder/entry/src/main/ets/utils/CommonUtils.ets diff --git a/app/oh/Vcoder/entry/src/main/ets/utils/DevecoStart.ets b/src/apps/vcoder/entry/src/main/ets/utils/DevecoStart.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/utils/DevecoStart.ets rename to src/apps/vcoder/entry/src/main/ets/utils/DevecoStart.ets diff --git a/app/oh/Vcoder/entry/src/main/ets/utils/Result.ets b/src/apps/vcoder/entry/src/main/ets/utils/Result.ets similarity index 100% rename from app/oh/Vcoder/entry/src/main/ets/utils/Result.ets rename to src/apps/vcoder/entry/src/main/ets/utils/Result.ets diff --git a/app/oh/Vcoder/entry/src/main/module.json5 b/src/apps/vcoder/entry/src/main/module.json5 similarity index 100% rename from app/oh/Vcoder/entry/src/main/module.json5 rename to src/apps/vcoder/entry/src/main/module.json5 diff --git a/app/oh/Vcoder/entry/src/main/resources/base/element/color.json b/src/apps/vcoder/entry/src/main/resources/base/element/color.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/element/color.json rename to src/apps/vcoder/entry/src/main/resources/base/element/color.json diff --git a/app/oh/Vcoder/entry/src/main/resources/base/element/float.json b/src/apps/vcoder/entry/src/main/resources/base/element/float.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/element/float.json rename to src/apps/vcoder/entry/src/main/resources/base/element/float.json diff --git a/app/oh/Vcoder/entry/src/main/resources/base/element/string.json b/src/apps/vcoder/entry/src/main/resources/base/element/string.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/element/string.json rename to src/apps/vcoder/entry/src/main/resources/base/element/string.json diff --git a/app/oh/Vcoder/entry/src/main/resources/base/media/background.png b/src/apps/vcoder/entry/src/main/resources/base/media/background.png similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/media/background.png rename to src/apps/vcoder/entry/src/main/resources/base/media/background.png diff --git a/app/oh/Vcoder/entry/src/main/resources/base/media/foreground.png b/src/apps/vcoder/entry/src/main/resources/base/media/foreground.png similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/media/foreground.png rename to src/apps/vcoder/entry/src/main/resources/base/media/foreground.png diff --git a/app/oh/Vcoder/entry/src/main/resources/base/media/layered_image.json b/src/apps/vcoder/entry/src/main/resources/base/media/layered_image.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/media/layered_image.json rename to src/apps/vcoder/entry/src/main/resources/base/media/layered_image.json diff --git a/app/oh/Vcoder/entry/src/main/resources/base/media/startIcon.png b/src/apps/vcoder/entry/src/main/resources/base/media/startIcon.png similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/media/startIcon.png rename to src/apps/vcoder/entry/src/main/resources/base/media/startIcon.png diff --git a/app/oh/Vcoder/entry/src/main/resources/base/profile/backup_config.json b/src/apps/vcoder/entry/src/main/resources/base/profile/backup_config.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/profile/backup_config.json rename to src/apps/vcoder/entry/src/main/resources/base/profile/backup_config.json diff --git a/app/oh/Vcoder/entry/src/main/resources/base/profile/main_pages.json b/src/apps/vcoder/entry/src/main/resources/base/profile/main_pages.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/base/profile/main_pages.json rename to src/apps/vcoder/entry/src/main/resources/base/profile/main_pages.json diff --git a/app/oh/Vcoder/entry/src/main/resources/dark/element/color.json b/src/apps/vcoder/entry/src/main/resources/dark/element/color.json similarity index 100% rename from app/oh/Vcoder/entry/src/main/resources/dark/element/color.json rename to src/apps/vcoder/entry/src/main/resources/dark/element/color.json diff --git a/app/oh/Vcoder/entry/src/mock/mock-config.json5 b/src/apps/vcoder/entry/src/mock/mock-config.json5 similarity index 100% rename from app/oh/Vcoder/entry/src/mock/mock-config.json5 rename to src/apps/vcoder/entry/src/mock/mock-config.json5 diff --git a/app/oh/Vcoder/entry/src/ohosTest/ets/test/Ability.test.ets b/src/apps/vcoder/entry/src/ohosTest/ets/test/Ability.test.ets similarity index 100% rename from app/oh/Vcoder/entry/src/ohosTest/ets/test/Ability.test.ets rename to src/apps/vcoder/entry/src/ohosTest/ets/test/Ability.test.ets diff --git a/app/oh/Vcoder/entry/src/ohosTest/ets/test/List.test.ets b/src/apps/vcoder/entry/src/ohosTest/ets/test/List.test.ets similarity index 100% rename from app/oh/Vcoder/entry/src/ohosTest/ets/test/List.test.ets rename to src/apps/vcoder/entry/src/ohosTest/ets/test/List.test.ets diff --git a/app/oh/Vcoder/entry/src/ohosTest/module.json5 b/src/apps/vcoder/entry/src/ohosTest/module.json5 similarity index 100% rename from app/oh/Vcoder/entry/src/ohosTest/module.json5 rename to src/apps/vcoder/entry/src/ohosTest/module.json5 diff --git a/app/oh/Vcoder/entry/src/test/List.test.ets b/src/apps/vcoder/entry/src/test/List.test.ets similarity index 100% rename from app/oh/Vcoder/entry/src/test/List.test.ets rename to src/apps/vcoder/entry/src/test/List.test.ets diff --git a/app/oh/Vcoder/entry/src/test/LocalUnit.test.ets b/src/apps/vcoder/entry/src/test/LocalUnit.test.ets similarity index 100% rename from app/oh/Vcoder/entry/src/test/LocalUnit.test.ets rename to src/apps/vcoder/entry/src/test/LocalUnit.test.ets diff --git a/app/oh/Vcoder/hvigor/hvigor-config.json5 b/src/apps/vcoder/hvigor/hvigor-config.json5 similarity index 100% rename from app/oh/Vcoder/hvigor/hvigor-config.json5 rename to src/apps/vcoder/hvigor/hvigor-config.json5 diff --git a/app/oh/Vcoder/hvigorfile.ts b/src/apps/vcoder/hvigorfile.ts similarity index 100% rename from app/oh/Vcoder/hvigorfile.ts rename to src/apps/vcoder/hvigorfile.ts diff --git a/app/oh/Vcoder/oh-package-lock.json5 b/src/apps/vcoder/oh-package-lock.json5 similarity index 100% rename from app/oh/Vcoder/oh-package-lock.json5 rename to src/apps/vcoder/oh-package-lock.json5 diff --git a/app/oh/Vcoder/oh-package.json5 b/src/apps/vcoder/oh-package.json5 similarity index 100% rename from app/oh/Vcoder/oh-package.json5 rename to src/apps/vcoder/oh-package.json5 diff --git a/src/web-ui/src/flow_chat/components/ChatInput.tsx b/src/web-ui/src/flow_chat/components/ChatInput.tsx index 74780f51cd..bfab815dbc 100644 --- a/src/web-ui/src/flow_chat/components/ChatInput.tsx +++ b/src/web-ui/src/flow_chat/components/ChatInput.tsx @@ -813,7 +813,7 @@ export const ChatInput: React.FC = ({ }); dispatchMode({ type: 'SET_CURRENT_MODE', payload: nextMode }); try { - sessionStorageAdapter.setItem('bitfun:flowchat:lastMode', session.mode); + sessionStorageAdapter.setItem('bitfun:flowchat:lastMode', nextMode); } catch { // ignore }