openharmony/applications_photos
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_photos synced 2024-11-23 15:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'pr_379' into 375_reintegration

Browse Source 
# Conflicts:
#	entry/src/main/ets/feature/formEditor/view/FormEditorPage.ets
This commit is contained in:
Sergey Andreev 2023-06-12 11:51:10 +03:00
commit 90133e3438
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
entry/src/main/ets/feature/formEditor/view/FormEditorPage.ets
View File

@ -49,9 +49,8 @@ struct FormEditorPage {
albumId: string = '';
@State time: number = 30;
@State intervalTime: Resource = $r('app.string.fa_play_interval_time_30');
private saveDataFunc = (albumName: string, albumId: string, displayName: object, index: number, isShow: boolean): Promise<void> =>
this.saveDataBindImpl(albumName, albumId, displayName, index, isShow);
private onChangeFunc = (value: number): void => this.onTabChangedBindImpl(value);
private saveDataFunc = this.saveData.bind(this);
private onChangeFunc = this.onChange.bind(this);
settingController: CustomDialogController = new CustomDialogController({
builder: SettingDialog(),
autoCancel: false,
@ -115,10 +114,10 @@ struct FormEditorPage {
}
updateFormData(): void {
Log.debug(TAG, "updateFormData formId: " + JSON.stringify(this.formId));
Log.debug(TAG, "updateFormData formId: " + JSON.stringify(this.formId));
let obj3 = this.bindFormData();
Log.debug(TAG, "updateFormData obj: " + JSON.stringify(obj3));
formProvider.updateForm(this.formId, obj3).then<void, void>((data: void): void => {
formProvider.updateForm(this.formId.toString(), obj3).then((data: void): void => {
Log.info(TAG, "updateFormData, data: " + JSON.stringify(data));
if (this.isShow) {
formProvider.setFormNextRefreshTime(this.formId, this.time).then<void, void>((): void => {
@ -130,24 +129,20 @@ struct FormEditorPage {
} else {
this.terminate();
}
}).catch((error: Error): void => {
}).catch((error): void => {
Log.error(TAG, "updateForm failed. Cause: " + JSON.stringify(error));
this.terminate();
});
}
async saveData(albumName: string, albumId: string, displayName: object, index: number, isShow: boolean): Promise<void> {
return await this.saveDataBindImpl(albumName, albumId, displayName, index, isShow)
}
async saveDataBindImpl(albumName: string, albumId: string, displayName: object, index: number, isShow: boolean): Promise<void> {
async saveData(albumName: string, albumId: string, displayName, index: number, isShow: boolean) {
Log.debug(TAG, "saveData start! " + albumName + " " + displayName + " " + index);
let msgDisplayName = '';
if (displayName instanceof String) {
msgDisplayName = displayName.toString();
} else {
if (displayName instanceof Object) {
Log.debug(TAG, "saveData object " + displayName);
msgDisplayName = await getResourceString(displayName as Resource);
msgDisplayName = await getResourceString(displayName);
} else {
msgDisplayName = displayName;
}
this.isShow = isShow;
this.albumId = albumId;