openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-12-04 05:22:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!9591 字体不跟随问题修复

Browse Source 
Merge pull request !9591 from songjindian/fix_font2
This commit is contained in:
openharmony_ci 2024-07-29 11:11:12 +00:00 committed by Gitee
commit 41f4a9a82e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 87 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frameworks/native/appkit/app/main_thread.cpp
View File

@ -160,6 +160,8 @@ const std::string OVERLAY_STATE_CHANGED = "usual.event.OVERLAY_STATE_CHANGED";
const std::string JSON_KEY_APP_FONT_SIZE_SCALE = "fontSizeScale";
const std::string JSON_KEY_APP_FONT_MAX_SCALE = "fontSizeMaxScale";
const std::string JSON_KEY_APP_CONFIGURATION = "configuration";
const std::string DEFAULT_APP_FONT_SIZE_SCALE = "nonFollowSystem";
const std::string SYSTEM_DEFAULT_FONTSIZE_SCALE = "1.0";
const int32_t TYPE_RESERVE = 1;
const int32_t TYPE_OTHERS = 2;
@ -1762,6 +1764,10 @@ void MainThread::HandleLaunchApplication(const AppLaunchData &appLaunchData, con
Configuration appConfig = config;
ParseAppConfigurationParams(bundleInfo.applicationInfo.configuration, appConfig);
std::string systemSizeScale = appConfig.GetItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE);
if (!systemSizeScale.empty() && systemSizeScale.compare(DEFAULT_APP_FONT_SIZE_SCALE) == 0) {
appConfig.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE, SYSTEM_DEFAULT_FONTSIZE_SCALE);
}
if (!InitResourceManager(resourceManager, entryHapModuleInfo, bundleInfo.name,
appConfig, bundleInfo.applicationInfo)) {
@ -3423,6 +3429,7 @@ void MainThread::ScheduleCacheProcess()
void MainThread::ParseAppConfigurationParams(const std::string configuration, Configuration &appConfig)
{
TAG_LOGD(AAFwkTag::APPKIT, "start");
appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE, DEFAULT_APP_FONT_SIZE_SCALE);
if (configuration.empty()) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "the configuration is empty");
return;
@ -3443,6 +3450,7 @@ void MainThread::ParseAppConfigurationParams(const std::string configuration, Co
}
if (jsonObject.contains(JSON_KEY_APP_FONT_SIZE_SCALE)
&& jsonObject[JSON_KEY_APP_FONT_SIZE_SCALE].is_string()) {
std::string configFontSizeScal = jsonObject.at(JSON_KEY_APP_FONT_SIZE_SCALE).get<std::string>();
appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE,
jsonObject.at(JSON_KEY_APP_FONT_SIZE_SCALE).get<std::string>());
}

112
frameworks/native/appkit/app/ohos_application.cpp
View File

@ -441,7 +441,6 @@ void OHOSApplication::OnConfigurationUpdated(Configuration config)
}
std::string language = config.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE);
std::string colorMode = config.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE);
std::string fontSizeScal = config.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE);
std::string languageIsSetByApp =
config.GetItem(AAFwk::GlobalConfigurationKey::LANGUAGE_IS_SET_BY_APP);
std::string colorModeIsSetByApp =
@ -455,45 +454,18 @@ void OHOSApplication::OnConfigurationUpdated(Configuration config)
configuration_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE);
std::string globalLanguageIsSetByApp =
configuration_->GetItem(AAFwk::GlobalConfigurationKey::LANGUAGE_IS_SET_BY_APP);
std::string globalColorModeIsSetByApp =
configuration_->GetItem(AAFwk::GlobalConfigurationKey::COLORMODE_IS_SET_BY_APP);
std::string globalColorModeIsSetBySa =
configuration_->GetItem(AAFwk::GlobalConfigurationKey::COLORMODE_IS_SET_BY_SA);
std::string globalFontFollowSysteme =
configuration_->GetItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE);
if (colorMode.compare(ConfigurationInner::COLOR_MODE_AUTO) == 0 && globalColorModeIsSetBySa.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "colorMode is auto");
constexpr int buffSize = 64;
char valueGet[buffSize] = { 0 };
auto res = GetParameter(PERSIST_DARKMODE_KEY, colorMode.c_str(), valueGet, buffSize);
if (res <= 0) {
TAG_LOGE(AAFwkTag::APPKIT, "get parameter failed.");
return;
}
config.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE, valueGet);
}
if (!colorMode.empty() && colorModeIsSetByApp.empty() && colorModeIsSetBySa.empty()) {
if ((!globalColorModeIsSetByApp.empty() && globalColorMode.compare(ConfigurationInner::COLOR_MODE_AUTO) != 0) ||
!globalColorModeIsSetBySa.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "colormode has been set by app or sa");
return;
}
}
if (!fontSizeScal.empty()) {
if (!globalFontFollowSysteme.empty()
&& globalFontFollowSysteme.compare(ConfigurationInner::IS_APP_FONT_FOLLOW_SYSTEM) != 0) {
TAG_LOGW(AAFwkTag::APPKIT, "the font configured for the app does not take effect with the system");
return;
}
}
if (!colorModeIsSetBySa.empty() && colorModeIsSetByApp.empty()) {
if (!globalColorModeIsSetByApp.empty() && globalColorMode.compare(ConfigurationInner::COLOR_MODE_AUTO) != 0) {
TAG_LOGD(AAFwkTag::APPKIT, "colormode has been set by app");
return;
}
}
if (!language.empty() && languageIsSetByApp.empty() && !globalLanguageIsSetByApp.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "language has been set by app");
// Whether the color changes with the system
bool isUpdateAppColor = isUpdateColor(config, colorMode, globalColorMode,
globalColorModeIsSetBySa, colorModeIsSetByApp, colorModeIsSetBySa);
// Whether the font changes with the system
bool isUpdateAppFontSize = isUpdateFontSize(config);
// Whether the language changes with the system
bool isUpdateAppLanguage = isUpdateLanguage(config, language, languageIsSetByApp, globalLanguageIsSetByApp);
// If size is not equal to 0, other keys need to be updated.
if (!isUpdateAppColor && !isUpdateAppFontSize && !isUpdateAppLanguage && config.GetItemSize() == 0) {
TAG_LOGD(AAFwkTag::UIABILITY, "Configuration does not need to be updated");
return;
}
std::vector<std::string> changeKeyV;
@ -1005,5 +977,69 @@ void OHOSApplication::CleanEmptyAbilityStage()
TAG_LOGI(AAFwkTag::APPKIT, "Application contains none empty abilityStage");
}
}
bool OHOSApplication::isUpdateColor(Configuration &config, std::string colorMode, std::string globalColorMode,
std::string globalColorModeIsSetBySa, std::string colorModeIsSetByApp, std::string colorModeIsSetBySa)
{
bool isUpdateColor = true;
if (colorMode.compare(ConfigurationInner::COLOR_MODE_AUTO) == 0 && globalColorModeIsSetBySa.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "colorMode is auto");
constexpr int buffSize = 64;
char valueGet[buffSize] = { 0 };
auto res = GetParameter(PERSIST_DARKMODE_KEY, colorMode.c_str(), valueGet, buffSize);
if (res <= 0) {
TAG_LOGE(AAFwkTag::APPKIT, "get parameter failed.");
return false;
}
config.AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE, valueGet);
}
std::string globalColorModeIsSetByApp =
configuration_->GetItem(AAFwk::GlobalConfigurationKey::COLORMODE_IS_SET_BY_APP);
if (!colorMode.empty() && colorModeIsSetByApp.empty() && colorModeIsSetBySa.empty()) {
if ((!globalColorModeIsSetByApp.empty() && globalColorMode.compare(ConfigurationInner::COLOR_MODE_AUTO) != 0) ||
!globalColorModeIsSetBySa.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "colormode has been set by app or sa");
config.RemoveItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE);
isUpdateColor = false;
}
}
if (!colorModeIsSetBySa.empty() && colorModeIsSetByApp.empty()) {
if (!globalColorModeIsSetByApp.empty() && globalColorMode.compare(ConfigurationInner::COLOR_MODE_AUTO) != 0) {
config.RemoveItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE);
isUpdateColor = false;
}
}
return isUpdateColor;
}
bool OHOSApplication::isUpdateFontSize(Configuration &config)
{
std::string fontSizeScal = config.GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE);
std::string globalFontFollowSysteme = configuration_->GetItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE);
if (!globalFontFollowSysteme.empty()
&& globalFontFollowSysteme.compare(ConfigurationInner::IS_APP_FONT_FOLLOW_SYSTEM) == 0) {
return true;
}
TAG_LOGW(AAFwkTag::APPKIT, "the font size configured for the app does not take effect with the system");
config.RemoveItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE);
configuration_->AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE,
ConfigurationInner::SYSTEM_DEFAULT_FONTSIZE_SCALE);
return false;
}
bool OHOSApplication::isUpdateLanguage(Configuration &config, const std::string language,
const std::string languageIsSetByApp, const std::string globalLanguageIsSetByApp)
{
if (!language.empty() && languageIsSetByApp.empty() && !globalLanguageIsSetByApp.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "language has been set by app");
config.RemoveItem(AAFwk::GlobalConfigurationKey::SYSTEM_LANGUAGE);
return false;
}
if (language.empty()) {
TAG_LOGD(AAFwkTag::APPKIT, "language is empty, need not update");
return false;
}
return true;
}
} // namespace AppExecFwk
} // namespace OHOS

5
interfaces/kits/native/appkit/app/ohos_application.h
View File

@ -320,6 +320,11 @@ public:
private:
void DoCleanWorkAfterStageCleaned(const AbilityInfo &abilityInfo);
void UpdateAppContextResMgr(const Configuration &config);
bool isUpdateColor(Configuration &config, std::string colorMode, std::string globalColorMode,
std::string globalColorModeIsSetBySa, std::string colorModeIsSetByApp, std::string colorModeIsSetBySa);
bool isUpdateFontSize(Configuration &config);
bool isUpdateLanguage(Configuration &config, const std::string language,
const std::string languageIsSetByApp, const std::string globalLanguageIsSetByApp);
private:
std::list<std::shared_ptr<AbilityLifecycleCallbacks>> abilityLifecycleCallbacks_;