设置图片名上传修改
author罗正yun <1732036298@qq.com>
Mon, 4 Dec 2023 02:10:30 +0000 (10:10 +0800)
committer罗正yun <1732036298@qq.com>
Mon, 4 Dec 2023 02:10:30 +0000 (10:10 +0800)
.vscode/launch.json
.vscode/settings.json
.vscode/tasks.json
Resource/res/SETTING_BLUETOOTH.bin [new file with mode: 0644]
code/sdk/application/wearable/nativeapp/nativelauncher/include/UiConfig.h

index b12bca7..b33f948 100644 (file)
@@ -8,10 +8,10 @@
             "DevEcoDebugInitPath": "${workspaceRoot}/.deveco/.debug-cache/brandy",\r
             "servertype": "jlink",\r
             "name": "brandy: DevEco GDB Launch",\r
-            "executable": "//wsl.localhost/Ubuntu-20.04/home/caiking/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf",\r
-            "toolchainBinDir": "",\r
+            "executable": "//wsl.localhost/Ubuntu-20.04/home/luozheng/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf",\r
+            "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env",\r
             "projectEnvName": "brandy",\r
-            "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core",\r
+            "coreDir": "D:/tool/DevEco-Device-Tool/core",\r
             "preLaunchTask": "deveco: run debug server - brandy",\r
             "internalConsoleOptions": "openOnSessionStart"\r
         },\r
             "DevEcoDebugInitPath": "${workspaceRoot}/.deveco/.debug-cache/brandy",\r
             "servertype": "jlink",\r
             "name": "brandy: DevEco GDB Attach",\r
-            "executable": "//wsl.localhost/Ubuntu-20.04/home/caiking/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf",\r
-            "toolchainBinDir": "",\r
+            "executable": "//wsl.localhost/Ubuntu-20.04/home/luozheng/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf",\r
+            "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env",\r
             "projectEnvName": "brandy",\r
-            "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core",\r
+            "coreDir": "D:/tool/DevEco-Device-Tool/core",\r
             "preLaunchTask": "deveco: run debug server - brandy",\r
             "internalConsoleOptions": "openOnSessionStart"\r
         }\r
index 7b6e82f..e1455a9 100644 (file)
@@ -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
index 9e2269b..3a7715b 100644 (file)
@@ -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"
             ]
             "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",
             "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"
             ]
             "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"
             ]
             "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"
             ]
                     "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 (file)
index 0000000..d875fde
Binary files /dev/null and b/Resource/res/SETTING_BLUETOOTH.bin differ
index abd7595..8e7f91a 100644 (file)
@@ -145,7 +145,7 @@ namespace OHOS
     static constexpr const char *PNG_BLUETOOTH_STITLE = APP_RES_PATH "/BLUETOOTH_TITLE.bin";\r
 \r
     static constexpr const char *PNG_DISPLAY_BRIGHTNESS = APP_RES_PATH "/DISPLAY_BRIGHTNESS.bin"; // 显示与亮度\r
-    static constexpr const char *PNG_BLUETOOTH = APP_RES_PATH "/BLUETOOTH.bin";                   // 蓝牙\r
+    static constexpr const char *PNG_BLUETOOTH = APP_RES_PATH "/SETTING_BLUETOOTH.bin";           // 蓝牙\r
     static constexpr const char *PNG_SOUND_VIBRATION = APP_RES_PATH "/SOUND_VIBRATION.bin";       // 声音与震动\r
     static constexpr const char *PNG_SECONDARY_FUNCTION = APP_RES_PATH "/QUICK_ACCESS.bin";       // 辅助功能\r
     static constexpr const char *PNG_SYSTEM = APP_RES_PATH "/SYSTEM.bin";                         // 系统\r