openharmony/miscservices_inputmethod
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_inputmethod.git synced 2026-07-19 12:08:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

!44 适配主用户

Browse Source 
Merge pull request !44 from ccll/master
This commit is contained in:
openharmony_ci
2022-01-26 02:12:25 +00:00
committed by Gitee
parent 423632ad7f 99bf61f75f
commit 6418005462
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/include/input_method_system_ability_stub.h
+1 -1
View File
@@ -37,7 +37,7 @@ namespace MiscServices {
void setInputMethodCoreFromHap(MessageParcel& data);
protected:
int32_t getUserId(int32_t uid);
int USER_ID_CHANGE_VALUE = 1000000;
int USER_ID_CHANGE_VALUE = 200000; // user range
};
}
}
services/src/input_method_system_ability.cpp
+8 -7
View File
@@ -26,6 +26,7 @@ namespace MiscServices {
using namespace MessageID;
REGISTER_SYSTEM_ABILITY_BY_ID(InputMethodSystemAbility, INPUT_METHOD_SYSTEM_ABILITY_ID, true);
const std::int32_t INIT_INTERVAL = 10000L;
const std::int32_t MAIN_USER_ID = 100;
std::mutex InputMethodSystemAbility::instanceLock_;
sptr<InputMethodSystemAbility> InputMethodSystemAbility::instance_;
@@ -162,18 +163,18 @@ namespace MiscServices {
workThreadHandler = std::thread([this] {
WorkThread();
});
PerUserSetting *setting = new PerUserSetting(0);
PerUserSession *session = new PerUserSession(0);
userSettings.insert(std::pair<int32_t, PerUserSetting*>(0, setting));
userSessions.insert(std::pair<int32_t, PerUserSession*>(0, session));
PerUserSetting *setting = new PerUserSetting(MAIN_USER_ID);
PerUserSession *session = new PerUserSession(MAIN_USER_ID);
userSettings.insert(std::pair<int32_t, PerUserSetting*>(MAIN_USER_ID, setting));
userSessions.insert(std::pair<int32_t, PerUserSession*>(MAIN_USER_ID, session));
setting->Initialize();
}
void InputMethodSystemAbility::StartInputService() {
PerUserSession *session = GetUserSession(0);
PerUserSession *session = GetUserSession(MAIN_USER_ID);
std::map<int32_t, MessageHandler*>::const_iterator it = msgHandlers.find(0);
std::map<int32_t, MessageHandler*>::const_iterator it = msgHandlers.find(MAIN_USER_ID);
if (it == msgHandlers.end()) {
IMSA_HILOGE("InputMethodSystemAbility::StartInputService() need start handler");
MessageHandler *handler = new MessageHandler();
@@ -181,7 +182,7 @@ namespace MiscServices {
IMSA_HILOGE("InputMethodSystemAbility::OnPrepareInput session is nullptr");
}
session->CreateWorkThread(*handler);
msgHandlers.insert(std::pair<int32_t, MessageHandler*>(0, handler));
msgHandlers.insert(std::pair<int32_t, MessageHandler*>(MAIN_USER_ID, handler));
}
if (!session->StartInputService()) {