Merge #1343 into sdk602patch0911 from refs/changes/1343/head 1346/target/1
author彭磊 <1624952103@qq.com>
Tue, 5 Nov 2024 08:54:51 +0000 (08:54 +0000)
committersnickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Tue, 5 Nov 2024 08:54:51 +0000 (08:54 +0000)
commit960662fd4eb2f49d2d2ef14050eb6fdcee8f87d7
treef3581954b49b11bacfca37c015eb1af9ab8cf3d4
parent1f7bb8a96e2edc90b149659ddb4feb85254a5ce8
Merge #1343 into sdk602patch0911 from refs/changes/1343/head

ui产测老化测试使用蓝牙老化测试,关闭cywee数据与电量数据打印

* refs/changes/1343/head: (2 commits squashed)

  - ui产测老化测试使用蓝牙老化测试,关闭cywee数据与电量数据打印

  - Merge branch &#39;sdk602patch0911&#39; of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0911

Signed-off-by: aliyun6865282430 <1624952103@qq.com>
Reviewed-by: Caisking <3449750381@qq.com>
Reviewed-by: 罗正 <1732036298@qq.com>
Reviewed-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: aliyun6865282430 <1624952103@qq.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1343
14 files changed:
code/sdk/application/battery/service/battery_driver.cpp
code/sdk/application/wearable/fd230app/nativeui/producttest/include/testPresenter.h
code/sdk/application/wearable/fd230app/nativeui/producttest/include/testold.h
code/sdk/application/wearable/fd230app/nativeui/producttest/src/testModel.cpp
code/sdk/application/wearable/fd230app/nativeui/producttest/src/testPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/producttest/src/testView.cpp
code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp
code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c
code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.h
code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
code/sdk/drivers/peripheral/cywee/service/cywee_service.c
code/sdk/drivers/peripheral/cywee/src/main_dml.c
code/sdk/drivers/peripheral/utils/custom_cmd_service.c
code/sdk/drivers/peripheral/utils/custom_utils.h