openharmony/telephony_core_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/telephony_core_service synced 2024-11-23 08:00:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!2237 wifiOnly平板显示无卡图标

Browse Source 
Merge pull request !2237 from zhouyan/master
This commit is contained in:
openharmony_ci 2024-09-03 12:10:18 +00:00 committed by Gitee
commit a335ce9c75
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/native/src/core_service_proxy.cpp
View File

@ -2518,7 +2518,7 @@ int32_t CoreServiceProxy::GetOpName(int32_t slotId, std::u16string &opname)
int32_t CoreServiceProxy::GetMaxSimCount()
{
return SIM_SLOT_COUNT;
return SIM_SLOT_COUNT_REAL;
}
int32_t CoreServiceProxy::SendEnvelopeCmd(int32_t slotId, const std::string &cmd)

13
interfaces/innerkits/include/telephony_types.h
View File

@ -26,6 +26,7 @@
namespace OHOS {
namespace Telephony {
#define SIM_SLOT_COUNT GetMaxSlotCount<int32_t>()
#define SIM_SLOT_COUNT_REAL GetRealMaxSlotCount<int32_t>()
#define PREFERRED_NETWORK_TYPE GetPreferredNetworkType<int32_t>()
#define VSIM_MODEM_COUNT GetVSimModemCount<int32_t>()
#define IS_SUPPORT_VSIM (VSIM_MODEM_COUNT > 0)
@ -41,6 +42,7 @@ inline const size_t MAX_PARAMETER_LENGTH = 100;
inline const int32_t DUAL_SLOT_COUNT = 2;
inline const int32_t MAX_SLOT_COUNT = 3;
inline const int32_t VSIM_DEFAULT_VALUE = -1;
inline int32_t maxRealSlotCount_ = 0;
inline int32_t maxSlotCount_ = 0;
inline int32_t vSimModemCount_ = VSIM_DEFAULT_VALUE;
inline constexpr const char *SATELLITE_DEFAULT_VALUE = "0";
@ -84,6 +86,17 @@ inline T GetMaxSlotCount()
return maxSlotCount_;
}
template<typename T>
inline T GetRealMaxSlotCount()
{
if (maxRealSlotCount_ == 0) {
char realSimSlotCount[SYSPARA_SIZE] = { 0 };
GetParameter(TEL_SIM_SLOT_COUNT, DEFAULT_SLOT_COUNT, realSimSlotCount, SYSPARA_SIZE);
maxRealSlotCount_ = std::atoi(realSimSlotCount);
}
return maxRealSlotCount_;
}
template<typename T>
inline T GetVSimModemCount()
{