From 0080f06b8733d73b8d8f6f991fa2cb5181bde904 Mon Sep 17 00:00:00 2001 From: libenyao Date: Tue, 28 Feb 2023 20:12:13 +0800 Subject: [PATCH] add util part 3 and modify warns Signed-off-by: libenyao --- cli/CommandLine.cpp | 9 ++++++--- util/PublicMethods.cpp | 6 ++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cli/CommandLine.cpp b/cli/CommandLine.cpp index 59af7c2..2d68d8b 100644 --- a/cli/CommandLine.cpp +++ b/cli/CommandLine.cpp @@ -943,7 +943,8 @@ void ChargeModeCommand::RunGet() void ChargeModeCommand::RunSet() { - SharedData::SetData(SharedDataType::BATTERY_STATUS, static_cast(atoi(args["ChargeMode"].asString().data()))); + SharedData::SetData(SharedDataType::BATTERY_STATUS, + static_cast(atoi(args["ChargeMode"].asString().data()))); Json::Value result = true; SetCommandResult("result", result); ILOG("Set chargeMode run finished, the value is: %s", args["ChargeMode"].asString().c_str()); @@ -1022,7 +1023,8 @@ void HeartRateCommand::RunGet() void HeartRateCommand::RunSet() { - SharedData::SetData(SharedDataType::HEARTBEAT_VALUE, static_cast(atoi(args["HeartRate"].asString().data()))); + SharedData::SetData(SharedDataType::HEARTBEAT_VALUE, + static_cast(atoi(args["HeartRate"].asString().data()))); Json::Value result = true; SetCommandResult("result", result); ILOG("Set heartRate run finished, the value is: %s", args["HeartRate"].asString().c_str()); @@ -1065,7 +1067,8 @@ void StepCountCommand::RunGet() void StepCountCommand::RunSet() { - SharedData::SetData(SharedDataType::SUMSTEP_VALUE, static_cast(atoi(args["StepCount"].asString().data()))); + SharedData::SetData(SharedDataType::SUMSTEP_VALUE, + static_cast(atoi(args["StepCount"].asString().data()))); Json::Value result = true; SetCommandResult("result", result); ILOG("Set stepCount run finished, the value is: %s", args["StepCount"].asString().c_str()); diff --git a/util/PublicMethods.cpp b/util/PublicMethods.cpp index d1747b8..67693b3 100644 --- a/util/PublicMethods.cpp +++ b/util/PublicMethods.cpp @@ -20,6 +20,8 @@ using namespace std; uint32_t PublicMethods::Ulltoa(uintptr_t value, int8_t (&rstStr)[MAX_ITOA_BIT]) { const int32_t RADIX_HEXADECIMAL = 16; + const int32_t dividendLength = 10; + auto remainder = value; int8_t strSpace[MAX_ITOA_BIT] = {0}; @@ -30,10 +32,10 @@ uint32_t PublicMethods::Ulltoa(uintptr_t value, int8_t (&rstStr)[MAX_ITOA_BIT]) rstLength++; dividend = remainder % RADIX_HEXADECIMAL; remainder = remainder / RADIX_HEXADECIMAL; - if (dividend < 10) { // Converted to hexadecimal + if (dividend < dividendLength) { // Converted to hexadecimal *curPoint++ = dividend + '0'; } else { - *curPoint++ = dividend + 'a' - 10; + *curPoint++ = dividend + 'a' - dividendLength; } } int8_t* tmpRstStr = rstStr;