From: 罗正yun <1732036298@qq.com> Date: Mon, 4 Dec 2023 02:10:30 +0000 (+0800) Subject: 设置图片名上传修改 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=817cb6f4bd20e66dcebb714a1db292e6c9cf39aa;p=mirrors%2FFD230.git 设置图片名上传修改 --- diff --git a/.vscode/launch.json b/.vscode/launch.json index b12bca77e..b33f94839 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,10 +8,10 @@ "DevEcoDebugInitPath": "${workspaceRoot}/.deveco/.debug-cache/brandy", "servertype": "jlink", "name": "brandy: DevEco GDB Launch", - "executable": "//wsl.localhost/Ubuntu-20.04/home/caiking/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", - "toolchainBinDir": "", + "executable": "//wsl.localhost/Ubuntu-20.04/home/luozheng/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", + "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", "projectEnvName": "brandy", - "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", + "coreDir": "D:/tool/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", "internalConsoleOptions": "openOnSessionStart" }, @@ -21,10 +21,10 @@ "DevEcoDebugInitPath": "${workspaceRoot}/.deveco/.debug-cache/brandy", "servertype": "jlink", "name": "brandy: DevEco GDB Attach", - "executable": "//wsl.localhost/Ubuntu-20.04/home/caiking/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", - "toolchainBinDir": "", + "executable": "//wsl.localhost/Ubuntu-20.04/home/luozheng/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", + "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", "projectEnvName": "brandy", - "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", + "coreDir": "D:/tool/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", "internalConsoleOptions": "openOnSessionStart" } diff --git a/.vscode/settings.json b/.vscode/settings.json index 7b6e82f94..e1455a90c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,6 @@ "chrono": "cpp", "iostream": "cpp" }, - "C_Cpp.errorSquiggles": "disabled" + "C_Cpp.errorSquiggles": "disabled", + "cmake.sourceDirectory": "/home/luozheng/FD230/code/sdk" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9e2269bc3..3a7715ba0 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,13 +7,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "clean", "--project-dir", - "\\\\wsl.localhost\\Ubuntu-20.04\\home\\caiking\\FD230", + "\\\\wsl.localhost\\Ubuntu-20.04\\home\\luozheng\\FD230", "--environment", "brandy" ] @@ -24,11 +24,11 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--project-dir", - "\\\\wsl.localhost\\Ubuntu-20.04\\home\\caiking\\FD230", + "\\\\wsl.localhost\\Ubuntu-20.04\\home\\luozheng\\FD230", "--environment", "brandy" ] @@ -39,7 +39,7 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", @@ -47,7 +47,7 @@ "--target", "buildprog", "--project-dir", - "\\\\wsl.localhost\\Ubuntu-20.04\\home\\caiking\\FD230", + "\\\\wsl.localhost\\Ubuntu-20.04\\home\\luozheng\\FD230", "--environment", "brandy" ] @@ -58,7 +58,7 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", @@ -71,13 +71,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "upload", "--project-dir", - "\\\\wsl.localhost\\Ubuntu-20.04\\home\\caiking\\FD230", + "\\\\wsl.localhost\\Ubuntu-20.04\\home\\luozheng\\FD230", "--environment", "brandy" ] @@ -88,13 +88,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "stackAnalysis", "--project-dir", - "\\\\wsl.localhost\\Ubuntu-20.04\\home\\caiking\\FD230", + "\\\\wsl.localhost\\Ubuntu-20.04\\home\\luozheng\\FD230", "--environment", "brandy" ] @@ -105,13 +105,13 @@ "problemMatcher": [ "$deveco" ], - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "imageAnalysis", "--project-dir", - "\\\\wsl.localhost\\Ubuntu-20.04\\home\\caiking\\FD230", + "\\\\wsl.localhost\\Ubuntu-20.04\\home\\luozheng\\FD230", "--environment", "brandy" ] @@ -129,7 +129,7 @@ "endsPattern": "^.*Listening\\son\\sTCP/IP\\sport.*" } }, - "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "debug", "--interface=server", diff --git a/Resource/res/SETTING_BLUETOOTH.bin b/Resource/res/SETTING_BLUETOOTH.bin new file mode 100644 index 000000000..d875fde65 Binary files /dev/null and b/Resource/res/SETTING_BLUETOOTH.bin differ diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h index abd759595..8e7f91ab5 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h @@ -145,7 +145,7 @@ namespace OHOS static constexpr const char *PNG_BLUETOOTH_STITLE = APP_RES_PATH "/BLUETOOTH_TITLE.bin"; static constexpr const char *PNG_DISPLAY_BRIGHTNESS = APP_RES_PATH "/DISPLAY_BRIGHTNESS.bin"; // 显示与亮度 - static constexpr const char *PNG_BLUETOOTH = APP_RES_PATH "/BLUETOOTH.bin"; // 蓝牙 + static constexpr const char *PNG_BLUETOOTH = APP_RES_PATH "/SETTING_BLUETOOTH.bin"; // 蓝牙 static constexpr const char *PNG_SOUND_VIBRATION = APP_RES_PATH "/SOUND_VIBRATION.bin"; // 声音与震动 static constexpr const char *PNG_SECONDARY_FUNCTION = APP_RES_PATH "/QUICK_ACCESS.bin"; // 辅助功能 static constexpr const char *PNG_SYSTEM = APP_RES_PATH "/SYSTEM.bin"; // 系统