From: Caisking <3449750381@qq.com> Date: Mon, 27 Nov 2023 01:27:53 +0000 (+0800) Subject: 增加资源文件 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=661abc2424942d9d625e59648602a59612faca98;p=mirrors%2FFD230.git 增加资源文件 --- diff --git a/.vscode/launch.json b/.vscode/launch.json index a545150f8..f44192071 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": "D:/work/haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", - "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", + "executable": "C:/Users/caiking/project/1.haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", + "toolchainBinDir": "", "projectEnvName": "brandy", - "coreDir": "D:/tool/DevEco-Device-Tool/core", + "coreDir": "C:/Users/caiking/my_app/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": "D:/work/haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", - "toolchainBinDir": "D:/tool/DevTools_CFBB_V1.0.6/cc_riscv32_win_env", + "executable": "C:/Users/caiking/project/1.haisi/FD230/./software/code/sdk/output/brandy/acore/brandy-liteos/application.elf", + "toolchainBinDir": "", "projectEnvName": "brandy", - "coreDir": "D:/tool/DevEco-Device-Tool/core", + "coreDir": "C:/Users/caiking/my_app/DevEco-Device-Tool/core", "preLaunchTask": "deveco: run debug server - brandy", "internalConsoleOptions": "openOnSessionStart" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 88bfb319c..36cb2db27 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,13 +7,13 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "clean", "--project-dir", - "D:\\work\\haisi\\FD230", + "C:\\Users\\caiking\\project\\1.haisi\\FD230", "--environment", "brandy" ] @@ -24,11 +24,11 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--project-dir", - "D:\\work\\haisi\\FD230", + "C:\\Users\\caiking\\project\\1.haisi\\FD230", "--environment", "brandy" ] @@ -39,7 +39,7 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", @@ -47,7 +47,7 @@ "--target", "buildprog", "--project-dir", - "D:\\work\\haisi\\FD230", + "C:\\Users\\caiking\\project\\1.haisi\\FD230", "--environment", "brandy" ] @@ -58,7 +58,7 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", @@ -71,13 +71,13 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "upload", "--project-dir", - "D:\\work\\haisi\\FD230", + "C:\\Users\\caiking\\project\\1.haisi\\FD230", "--environment", "brandy" ] @@ -88,13 +88,13 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "stackAnalysis", "--project-dir", - "D:\\work\\haisi\\FD230", + "C:\\Users\\caiking\\project\\1.haisi\\FD230", "--environment", "brandy" ] @@ -105,13 +105,13 @@ "problemMatcher": [ "$deveco" ], - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "run", "--target", "imageAnalysis", "--project-dir", - "D:\\work\\haisi\\FD230", + "C:\\Users\\caiking\\project\\1.haisi\\FD230", "--environment", "brandy" ] @@ -129,7 +129,7 @@ "endsPattern": "^.*Listening\\son\\sTCP/IP\\sport.*" } }, - "command": "D:\\tool\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", + "command": "C:\\Users\\caiking\\my_app\\DevEco-Device-Tool\\core\\deveco-venv\\Scripts\\hos.exe", "args": [ "debug", "--interface=server", diff --git a/Resource/res/BLUETOOTH.bin b/Resource/res/BLUETOOTH.bin index d875fde65..358e24be0 100644 Binary files a/Resource/res/BLUETOOTH.bin and b/Resource/res/BLUETOOTH.bin differ diff --git a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp index bd6a8b504..b076bd132 100644 --- a/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp +++ b/code/sdk/application/wearable/nativeapp/nativeui/clock/src/MainClockView.cpp @@ -132,6 +132,10 @@ void MainClockView::InitStepValue() bool MainClockView::InitLabelView(void) { UIView::OnClickListener *clickListener = (UIView::OnClickListener *)OHOS::MainPresenterSample::GetInstance(); + // 创建长按事件监听器对象 + UIView::OnLongPressListener* longPressListener = (UIView::OnLongPressListener*)OHOS::MainPresenterSample::GetInstance(); + + stepLabel = new UILabelButton(); if (stepLabel == nullptr) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "stepLabel new fail");