Skip to content

添加空值检查，修复handleColorFilters方法里的item?.keypath包含非法值，导致应用闪退问题 #61 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
1280475215 wants to merge 1 commit into
base: sig
Choose a base branch
from
Open

添加空值检查，修复handleColorFilters方法里的item?.keypath包含非法值，导致应用闪退问题 #61 #62

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 28 additions & 9 deletions harmony/lottie/src/main/ets/LottieAnimationView.ets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,35 @@ export struct LottieAnimationView {
const layersData: Array<layersItem> = this.jsonData?.layers ?? [];
const colorFiltersData: Array<colorFiltersItem> =
(this.descriptorWrapper.props.colorFilters ?? []) as Array<colorFiltersItem>;

for (const item of colorFiltersData) {
const index: number = layersData.findIndex((layersItem: layersItem) => layersItem?.nm === item?.keypath);
const color: Array<number> = this.getColorByColorFilters(item);
const isIndex: boolean = index !== (-1);
const isColor: boolean = color.length === 3;
if (isIndex && isColor) {
this.animateItem?.changeColor(color, index + 1);
this.logger.debug('colorFilters success:', item?.keypath);
} else {
this.logger.error('colorFilters fail:not find keyPath', item?.keypath);
// 添加空值检查
if (!item || typeof item.keypath !== 'string') {
this.logger.error('colorFilters fail: invalid item or keypath', item);
continue;
}

try {
const index: number = layersData.findIndex((layersItem: layersItem) => {
// 添加空值检查
if (!layersItem || typeof layersItem?.nm !== 'string') {
return false;
}
return layersItem?.nm === item?.keypath;
});

const color: Array<number> = this.getColorByColorFilters(item);
const isIndex: boolean = index !== (-1);
const isColor: boolean = color && color.length === 3;

if (isIndex && isColor) {
this.animateItem?.changeColor(color, index + 1);
this.logger.debug('colorFilters success:', item?.keypath);
} else {
this.logger.error('colorFilters fail:not find keyPath', item?.keypath);
}
} catch (error) {
this.logger.error('colorFilters error processing item: ', error);
}
}
}
Expand Down