openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 01:03:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!47776 【挑单】解决超大函数

Browse Source 
Merge pull request !47776 from 吴寅潇/fixBigMethod-5.0.1
This commit is contained in:
openharmony_ci 2024-11-06 08:39:27 +00:00 committed by Gitee
commit 617b4885e1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
frameworks/bridge/declarative_frontend/jsview/js_view_abstract.cpp
View File

@ -4134,31 +4134,22 @@ void JSViewAbstract::JsBorderImage(const JSCallbackInfo& info)
return;
}
JSRef<JSObject> object = JSRef<JSObject>::Cast(jsVal);
if (object->IsEmpty()) {
return;
}
CHECK_NULL_VOID(!object->IsEmpty());
RefPtr<BorderImage> borderImage = AceType::MakeRefPtr<BorderImage>();
uint8_t imageBorderBitsets = 0;
auto valueSource = object->GetProperty(static_cast<int32_t>(ArkUIIndex::SOURCE));
if (!valueSource->IsString() && !valueSource->IsObject()) {
return;
}
CHECK_NULL_VOID((valueSource->IsString() || valueSource->IsObject()));
std::string srcResult;
if (valueSource->IsString()) {
srcResult = valueSource->ToString();
if (!srcResult.empty()) {
borderImage->SetSrc(srcResult);
imageBorderBitsets |= BorderImage::SOURCE_BIT;
}
if (valueSource->IsString() && !valueSource->ToString().empty()) {
borderImage->SetSrc(valueSource->ToString());
imageBorderBitsets |= BorderImage::SOURCE_BIT;
} else if (valueSource->IsObject() && ParseJsMedia(valueSource, srcResult)) {
borderImage->SetSrc(srcResult);
imageBorderBitsets |= BorderImage::SOURCE_BIT;
} else if (valueSource->IsObject()) {
if (ParseJsMedia(valueSource, srcResult)) {
borderImage->SetSrc(srcResult);
imageBorderBitsets |= BorderImage::SOURCE_BIT;
} else {
ParseBorderImageLinearGradient(valueSource, imageBorderBitsets);
}
ParseBorderImageLinearGradient(valueSource, imageBorderBitsets);
}
auto valueOutset = object->GetProperty("outset");
if (valueOutset->IsNumber() || valueOutset->IsString() || valueOutset->IsObject()) {
@ -4311,29 +4302,8 @@ bool JSViewAbstract::CheckJSCallbackInfo(
return typeVerified || infoTypes.size() == 0;
}
void JSViewAbstract::ParseBorderImageLinearGradient(const JSRef<JSVal>& args, uint8_t& bitset)
void JSViewAbstract::UpdateGradientWithDirection(NG::Gradient& lineGradient, NG::GradientDirection direction)
{
if (!args->IsObject()) {
return;
}
JSRef<JSObject> jsObj = JSRef<JSObject>::Cast(args);
NG::Gradient lineGradient;
lineGradient.CreateGradientWithType(NG::GradientType::LINEAR);
// angle
std::optional<float> degree;
if (Container::LessThanAPITargetVersion(PlatformVersion::VERSION_TWELVE)) {
GetJsAngle(static_cast<int32_t>(ArkUIIndex::ANGLE), jsObj, degree);
} else {
GetJsAngleWithDefault(static_cast<int32_t>(ArkUIIndex::ANGLE), jsObj, degree, 180.0f);
}
if (degree) {
lineGradient.GetLinearGradient()->angle = CalcDimension(degree.value(), DimensionUnit::PX);
degree.reset();
}
// direction
auto direction = static_cast<NG::GradientDirection>(
jsObj->GetPropertyValue<int32_t>(static_cast<int32_t>(ArkUIIndex::DIRECTION),
static_cast<int32_t>(NG::GradientDirection::NONE)));
switch (direction) {
case NG::GradientDirection::LEFT:
lineGradient.GetLinearGradient()->linearX = NG::GradientDirection::LEFT;
@ -4369,6 +4339,32 @@ void JSViewAbstract::ParseBorderImageLinearGradient(const JSRef<JSVal>& args, ui
default:
break;
}
}
void JSViewAbstract::ParseBorderImageLinearGradient(const JSRef<JSVal>& args, uint8_t& bitset)
{
if (!args->IsObject()) {
return;
}
JSRef<JSObject> jsObj = JSRef<JSObject>::Cast(args);
NG::Gradient lineGradient;
lineGradient.CreateGradientWithType(NG::GradientType::LINEAR);
// angle
std::optional<float> degree;
if (Container::LessThanAPITargetVersion(PlatformVersion::VERSION_TWELVE)) {
GetJsAngle(static_cast<int32_t>(ArkUIIndex::ANGLE), jsObj, degree);
} else {
GetJsAngleWithDefault(static_cast<int32_t>(ArkUIIndex::ANGLE), jsObj, degree, 180.0f);
}
if (degree) {
lineGradient.GetLinearGradient()->angle = CalcDimension(degree.value(), DimensionUnit::PX);
degree.reset();
}
// direction
auto direction = static_cast<NG::GradientDirection>(
jsObj->GetPropertyValue<int32_t>(static_cast<int32_t>(ArkUIIndex::DIRECTION),
static_cast<int32_t>(NG::GradientDirection::NONE)));
UpdateGradientWithDirection(lineGradient, direction);
auto repeating = jsObj->GetPropertyValue<bool>(static_cast<int32_t>(ArkUIIndex::REPEATING), false);
lineGradient.SetRepeat(repeating);
NewGetJsGradientColorStops(lineGradient, jsObj->GetProperty(static_cast<int32_t>(ArkUIIndex::COLORS)));

1
frameworks/bridge/declarative_frontend/jsview/js_view_abstract.h
View File

@ -230,6 +230,7 @@ public:
const JSRef<JSVal>& args, BorderImage::BorderImageOption& borderImageDimension);
static void ParseBorderImageLengthMetrics(
const JSRef<JSObject>& object, LocalizedCalcDimension& localizedCalcDimension);
static void UpdateGradientWithDirection(NG::Gradient& lineGradient, NG::GradientDirection direction);
static void ParseBorderImageLinearGradient(const JSRef<JSVal>& args, uint8_t& bitset);
static void JsUseEffect(const JSCallbackInfo& info);
static void JsUseShadowBatching(const JSCallbackInfo& info);