From 7298c4090cab3173fd582c9769767435d9894ec7 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 8 May 2025 15:52:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0086=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- services/manager/include/cellular_call_handler.h | 1 + services/manager/src/cellular_call_handler.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/services/manager/include/cellular_call_handler.h b/services/manager/include/cellular_call_handler.h index c3b3dbc..29bab86 100755 --- a/services/manager/include/cellular_call_handler.h +++ b/services/manager/include/cellular_call_handler.h @@ -196,6 +196,7 @@ public: public: const uint32_t REGISTER_HANDLER_ID = 10003; const std::string PHONE_CONTEXT_UNEXPECTED = "0086"; + const std::string PHONE_CONTEXT_UNEXPECTED_1 = "086"; const std::string PHONE_CONTEXT_EXPECTED = "+86"; const std::string DOUBLE_PHONE_CONTEXT_STRING = "^\\+8686(13[0-9]|14[5-9]|15[0-9]|166|17[0-9]" "|18[0-9]|19[0-9])\\d{8}$"; diff --git a/services/manager/src/cellular_call_handler.cpp b/services/manager/src/cellular_call_handler.cpp index 2f3a6f4..5c7f1fa 100755 --- a/services/manager/src/cellular_call_handler.cpp +++ b/services/manager/src/cellular_call_handler.cpp @@ -1396,13 +1396,17 @@ void CellularCallHandler::ProcessCsPhoneNumber(CallInfoList &list) } for (uint64_t i = 0; i < list.calls.size(); i++) { CallInfo callInfo = list.calls[i]; - if (callInfo.number.length() <= PHONE_CONTEXT_UNEXPECTED.length()) { + if (callInfo.number.length() <= PHONE_CONTEXT_UNEXPECTED_1.length()) { continue; } if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED.length(), PHONE_CONTEXT_UNEXPECTED) == 0) { list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED.length(), PHONE_CONTEXT_EXPECTED); } + if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_1.length(), PHONE_CONTEXT_UNEXPECTED_1) == 0) { + list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED_1.length(), + PHONE_CONTEXT_EXPECTED); + } } } @@ -1413,13 +1417,17 @@ void CellularCallHandler::ProcessImsPhoneNumber(ImsCurrentCallList &list) } for (uint64_t i = 0; i < list.calls.size(); i++) { ImsCurrentCall currentCall = list.calls[i]; - if (currentCall.number.length() <= PHONE_CONTEXT_UNEXPECTED.length()) { + if (currentCall.number.length() <= PHONE_CONTEXT_UNEXPECTED_1.length()) { continue; } if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED.length(), PHONE_CONTEXT_UNEXPECTED) == 0) { list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED.length(), PHONE_CONTEXT_EXPECTED); } + if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_1.length(), PHONE_CONTEXT_UNEXPECTED_1) == 0) { + list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED_1.length(), + PHONE_CONTEXT_EXPECTED); + } } } -- Gitee From 4b0601f328c0c6c65a08c1cd81b7206bc5a2ef5c Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 8 May 2025 16:38:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0086=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- test/unittest/cstest/cs2_test.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/unittest/cstest/cs2_test.cpp b/test/unittest/cstest/cs2_test.cpp index 11c1ee5..1546a8a 100644 --- a/test/unittest/cstest/cs2_test.cpp +++ b/test/unittest/cstest/cs2_test.cpp @@ -1222,6 +1222,13 @@ HWTEST_F(Cs2Test, cellular_call_CellularCallHandler_0004, Function | MediumTest callInfoLists.push_back(callInfo); callInfoListThird->calls = callInfoLists; fourthHandler.ProcessCsPhoneNumber(*callInfoListThird); + EXPECT_EQ(callInfoListThird->calls[0].number, expectedPhoneNumber); + callInfoLists.clear(); + unexpectedPhoneNumber = "0871565910xxxx"; + callInfo.number = unexpectedPhoneNumber; + callInfoLists.push_back(callInfo); + callInfoListThird->calls = callInfoLists; + fourthHandler.ProcessCsPhoneNumber(*callInfoListThird); EXPECT_EQ(callInfoListThird->calls[0].number, unexpectedPhoneNumber); } -- Gitee From 200c149755adc441eddbd4aa5f4d956c597fd8aa Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 8 May 2025 18:49:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0086=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- test/unittest/cstest/cs2_test.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/unittest/cstest/cs2_test.cpp b/test/unittest/cstest/cs2_test.cpp index 1546a8a..0abb35d 100644 --- a/test/unittest/cstest/cs2_test.cpp +++ b/test/unittest/cstest/cs2_test.cpp @@ -1223,13 +1223,6 @@ HWTEST_F(Cs2Test, cellular_call_CellularCallHandler_0004, Function | MediumTest callInfoListThird->calls = callInfoLists; fourthHandler.ProcessCsPhoneNumber(*callInfoListThird); EXPECT_EQ(callInfoListThird->calls[0].number, expectedPhoneNumber); - callInfoLists.clear(); - unexpectedPhoneNumber = "0871565910xxxx"; - callInfo.number = unexpectedPhoneNumber; - callInfoLists.push_back(callInfo); - callInfoListThird->calls = callInfoLists; - fourthHandler.ProcessCsPhoneNumber(*callInfoListThird); - EXPECT_EQ(callInfoListThird->calls[0].number, unexpectedPhoneNumber); } /** -- Gitee From 26d6d80614af7db14aeae910e51ed106a295f28a Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 8 May 2025 18:51:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0086=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- test/unittest/imstest/ims2_test.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/unittest/imstest/ims2_test.cpp b/test/unittest/imstest/ims2_test.cpp index bb105ff..8a4d950 100644 --- a/test/unittest/imstest/ims2_test.cpp +++ b/test/unittest/imstest/ims2_test.cpp @@ -951,6 +951,12 @@ HWTEST_F(Ims2Test, cellular_call_CellularCallHandler_0005, Function | MediumTest imsCurrent.number = unexpected; imsCurrentCallList->calls.push_back(imsCurrent); handler.ProcessImsPhoneNumber(*imsCurrentCallList); + EXPECT_EQ(imsCurrentCallList->calls[0].number, expected); + imsCurrentCallList->calls.clear(); + unexpected = "08761565910xxxx"; + imsCurrent.number = unexpected; + imsCurrentCallList->calls.push_back(imsCurrent); + handler.ProcessImsPhoneNumber(*imsCurrentCallList); EXPECT_EQ(imsCurrentCallList->calls[0].number, unexpected); } -- Gitee From 364228c00a42a40e0ce8497167a1a1153978dc88 Mon Sep 17 00:00:00 2001 From: lishuo Date: Thu, 8 May 2025 19:44:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0086=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- .../manager/include/cellular_call_handler.h | 4 ++-- .../manager/src/cellular_call_handler.cpp | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/services/manager/include/cellular_call_handler.h b/services/manager/include/cellular_call_handler.h index 29bab86..f8b7dbf 100755 --- a/services/manager/include/cellular_call_handler.h +++ b/services/manager/include/cellular_call_handler.h @@ -195,8 +195,8 @@ public: public: const uint32_t REGISTER_HANDLER_ID = 10003; - const std::string PHONE_CONTEXT_UNEXPECTED = "0086"; - const std::string PHONE_CONTEXT_UNEXPECTED_1 = "086"; + const std::string PHONE_CONTEXT_UNEXPECTED_SCENARIO_1 = "0086"; + const std::string PHONE_CONTEXT_UNEXPECTED_SCENARIO_2 = "086"; const std::string PHONE_CONTEXT_EXPECTED = "+86"; const std::string DOUBLE_PHONE_CONTEXT_STRING = "^\\+8686(13[0-9]|14[5-9]|15[0-9]|166|17[0-9]" "|18[0-9]|19[0-9])\\d{8}$"; diff --git a/services/manager/src/cellular_call_handler.cpp b/services/manager/src/cellular_call_handler.cpp index 5c7f1fa..1c8a25f 100755 --- a/services/manager/src/cellular_call_handler.cpp +++ b/services/manager/src/cellular_call_handler.cpp @@ -1396,15 +1396,15 @@ void CellularCallHandler::ProcessCsPhoneNumber(CallInfoList &list) } for (uint64_t i = 0; i < list.calls.size(); i++) { CallInfo callInfo = list.calls[i]; - if (callInfo.number.length() <= PHONE_CONTEXT_UNEXPECTED_1.length()) { + if (callInfo.number.length() <= PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length()) { continue; } - if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED.length(), PHONE_CONTEXT_UNEXPECTED) == 0) { - list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED.length(), + if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_1) == 0) { + list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_EXPECTED); } - if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_1.length(), PHONE_CONTEXT_UNEXPECTED_1) == 0) { - list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED_1.length(), + if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_2) == 0) { + list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_EXPECTED); } } @@ -1417,15 +1417,15 @@ void CellularCallHandler::ProcessImsPhoneNumber(ImsCurrentCallList &list) } for (uint64_t i = 0; i < list.calls.size(); i++) { ImsCurrentCall currentCall = list.calls[i]; - if (currentCall.number.length() <= PHONE_CONTEXT_UNEXPECTED_1.length()) { + if (currentCall.number.length() <= PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length()) { continue; } - if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED.length(), PHONE_CONTEXT_UNEXPECTED) == 0) { - list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED.length(), + if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_1) == 0) { + list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_EXPECTED); } - if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_1.length(), PHONE_CONTEXT_UNEXPECTED_1) == 0) { - list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED_1.length(), + if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_2) == 0) { + list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_EXPECTED); } } -- Gitee From e7004b77a94e3024be4ee1a209d212ecef3b0aff Mon Sep 17 00:00:00 2001 From: lishuo Date: Fri, 9 May 2025 09:30:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=A1=8C=E6=95=B0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lishuo --- services/manager/src/cellular_call_handler.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/services/manager/src/cellular_call_handler.cpp b/services/manager/src/cellular_call_handler.cpp index 1c8a25f..94f097b 100755 --- a/services/manager/src/cellular_call_handler.cpp +++ b/services/manager/src/cellular_call_handler.cpp @@ -1399,11 +1399,13 @@ void CellularCallHandler::ProcessCsPhoneNumber(CallInfoList &list) if (callInfo.number.length() <= PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length()) { continue; } - if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_1) == 0) { + if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), + PHONE_CONTEXT_UNEXPECTED_SCENARIO_1) == 0) { list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_EXPECTED); } - if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_2) == 0) { + if (callInfo.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), + PHONE_CONTEXT_UNEXPECTED_SCENARIO_2) == 0) { list.calls[i].number = callInfo.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_EXPECTED); } @@ -1420,11 +1422,13 @@ void CellularCallHandler::ProcessImsPhoneNumber(ImsCurrentCallList &list) if (currentCall.number.length() <= PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length()) { continue; } - if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_1) == 0) { + if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), + PHONE_CONTEXT_UNEXPECTED_SCENARIO_1) == 0) { list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_1.length(), PHONE_CONTEXT_EXPECTED); } - if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_UNEXPECTED_SCENARIO_2) == 0) { + if (currentCall.number.compare(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), + PHONE_CONTEXT_UNEXPECTED_SCENARIO_2) == 0) { list.calls[i].number = currentCall.number.replace(0, PHONE_CONTEXT_UNEXPECTED_SCENARIO_2.length(), PHONE_CONTEXT_EXPECTED); } -- Gitee