update Boot Animation

Signed-off-by: donglin <donglin9@huawei.com>
This commit is contained in:
donglin 2022-08-11 14:38:09 +08:00
parent def5d6c7a1
commit 5b2c74c5a0
4 changed files with 10 additions and 10 deletions

View File

@ -31,7 +31,7 @@ constexpr const char* DEVICE_TYPE = "device_type";
constexpr const char* SYSTEM_CONFIGURATION = "system_configuration";
constexpr const char* SYSTEM_ORIENTATION = "system_orientation";
constexpr const char* ROOT_LAUNCHER_RESTART_MAX = "root_launcher_restart_max";
constexpr const char* BOOTANIMATION_TIMEOUT_TIME = "bootanimation_timeout_time";
constexpr const char* BOOT_ANIMATION_TIMEOUT_TIME = "boot_animation_timeout_time";
} // namespace AmsConfig
enum class SatrtUiMode { STATUSBAR = 1, NAVIGATIONBAR = 2, STARTUIBOTH = 3 };
@ -83,7 +83,7 @@ public:
/**
* get boot animation stared tiimout time.
*/
int GetBootanimationTimeoutTime() const;
int GetBootAnimationTimeoutTime() const;
enum { READ_OK = 0, READ_FAIL = 1, READ_JSON_FAIL = 2 };
@ -104,7 +104,7 @@ private:
int missionSaveTime_ {12 * 60 * 60 * 1000};
int anrTime_ {5000};
int amsTime_ {5000};
int bootanimationTime_ {5};
int bootAnimationTime_ {5};
std::string deviceType_ {""};
};
} // namespace AAFwk

View File

@ -5,7 +5,7 @@
"app_not_response_process_timeout_time" : 1000,
"ams_timeout_time" : 180,
"device_type" : "phone",
"bootanimation_timeout_time" : 5
"boot_animation_timeout_time" : 5
},
"system_configuration":{
"system_orientation": "vertical"

View File

@ -123,7 +123,7 @@ const std::string DMS_MISSION_ID = "dmsMissionId";
const std::string DLP_INDEX = "ohos.dlp.params.index";
const std::string BOOTEVENT_APPFWK_READY = "bootevent.appfwk.ready";
const std::string BOOTEVENT_BOOT_COMPLETED = "bootevent.boot.completed";
const std::string BOOTEVENT_BOOTANIMATION_STARTED = "bootevent.bootanimation.started";
const std::string BOOTEVENT_BOOT_ANIMATION_STARTED = "bootevent.bootanimation.started";
const int DEFAULT_DMS_MISSION_ID = -1;
const std::map<std::string, AbilityManagerService::DumpKey> AbilityManagerService::dumpMap = {
std::map<std::string, AbilityManagerService::DumpKey>::value_type("--all", KEY_DUMP_ALL),
@ -260,7 +260,7 @@ bool AbilityManagerService::Init()
implicitStartProcessor_ = std::make_shared<ImplicitStartProcessor>();
anrListener_ = std::make_shared<ApplicationAnrListener>();
MMI::InputManager::GetInstance()->SetAnrObserver(anrListener_);
WaitParameter(BOOTEVENT_BOOTANIMATION_STARTED.c_str(), "true", amsConfigResolver_->GetBootanimationTimeoutTime());
WaitParameter(BOOTEVENT_BOOT_ANIMATION_STARTED.c_str(), "true", amsConfigResolver_->GetBootAnimationTimeoutTime());
#endif
anrDisposer_ = std::make_shared<AppNoResponseDisposer>(amsConfigResolver_->GetANRTimeOutTime());

View File

@ -61,9 +61,9 @@ std::string AmsConfigurationParameter::GetDeviceType() const
return deviceType_;
}
int AmsConfigurationParameter::GetBootanimationTimeoutTime() const
int AmsConfigurationParameter::GetBootAnimationTimeoutTime() const
{
return bootanimationTime_;
return bootAnimationTime_;
}
int AmsConfigurationParameter::LoadAmsConfiguration(const std::string &filePath)
@ -123,8 +123,8 @@ int AmsConfigurationParameter::LoadAppConfigurationForStartUpService(nlohmann::j
Object.at(AmsConfig::SERVICE_ITEM_AMS).at(AmsConfig::AMS_TIMEOUT_TIME).get<int>();
maxRestartNum_ = Object.at(AmsConfig::SERVICE_ITEM_AMS).at(AmsConfig::ROOT_LAUNCHER_RESTART_MAX).get<int>();
deviceType_ = Object.at(AmsConfig::SERVICE_ITEM_AMS).at(AmsConfig::DEVICE_TYPE).get<std::string>();
bootanimationTime_ =
Object.at(AmsConfig::SERVICE_ITEM_AMS).at(AmsConfig::BOOTANIMATION_TIMEOUT_TIME).get<int>();
bootAnimationTime_ =
Object.at(AmsConfig::SERVICE_ITEM_AMS).at(AmsConfig::BOOT_ANIMATION_TIMEOUT_TIME).get<int>();
HILOG_INFO("get ams service config success!");
ret = 0;
}