Toggle navigation
Toggle navigation
This project
Loading...
Sign in
developOne
/
harmonyPool
Go to a project
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
chenquansheng
2024-09-09 19:15:43 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
cbf3224b98af704b3baf0e37f188851b92c6df3d
cbf3224b
1 parent
54610eda
fix |> 楼层数据请求失败回调补充
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
sight_harmony/commons/wdJsBridge/src/main/ets/core/BridgeWebViewControl.ets
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
sight_harmony/commons/wdJsBridge/src/main/ets/core/BridgeWebViewControl.ets
View file @
cbf3224
...
...
@@ -169,8 +169,6 @@ export class BridgeWebViewControl extends webview.WebviewController {
// messageJson = messageJson.replace("%7B", encodeURIComponent("%7B"));
// messageJson = messageJson.replace("%7D", encodeURIComponent("%7D"));
// messageJson = messageJson.replace("%22", encodeURIComponent("%22"));
// messageJson = messageJson.replace("/\n/g", "\\n").replace("/\r/g", "\\r").replace("/\f/g", "\\f").replace("/\"/g", "\\\"").replace("/\'/g", "\\\'").replace("/\u2028/g", "\\u2028").replace("/\u2029/g", "\\u2029");
let javascriptCommand: string = StringUtils.formatStringForJS(BridgeUtil.JS_HANDLE_MESSAGE_FROM_JAVA, messageJson);
// hilog.error(0xFF00, TAG, 'dispatchMessage111 '+ javascriptCommand.slice(0,2000));
...
...
sight_harmony/features/wdComponent/src/main/ets/components/page/PageComponent.ets
View file @
cbf3224
...
...
@@ -54,7 +54,15 @@ export struct PageComponent {
emptyType: this.pageModel.emptyType,
emptyButton: true,
retry: () => {
this.pageModel.viewType = ViewType.LOADING;
this.getData()
// this.pageModel.pageId = this.pageId;
// this.pageModel.groupId = this.pageId;
// this.pageModel.channelId = this.channelId;
// this.pageModel.currentPage = 1;
// this.pageModel.pageTotalCompSize = 0;
// this.listScroller.scrollToIndex(0)
// autoRefresh(this.pageModel, this.pageAdvModel)
}
})
.backgroundColor(Color.White)
...
...
@@ -277,6 +285,7 @@ export struct PageComponent {
Logger.info(TAG,
`onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`);
if (this.navIndex === this.currentTopNavSelectedIndex) {
Logger.debug(TAG, 'page onAutoRefresh111 ' + this.needload)
if (this.needload) {
this.getData();
}
...
...
sight_harmony/features/wdComponent/src/main/ets/viewmodel/PageViewModel.ets
View file @
cbf3224
...
...
@@ -66,7 +66,7 @@ export class PageViewModel extends BaseViewModel {
* @returns
*/
async getPageGroupCompData(pageModel: PageUIReqBean): Promise<PageDTO> {
Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId);
Logger.debug(TAG, 'getPage
GroupComp
Data pageId: ' + pageModel.pageId);
if (pageModel.isRecGroup) {
return this.parseComp(PageRepository.fetchRecCompData(pageModel))
} else {
...
...
@@ -75,6 +75,7 @@ export class PageViewModel extends BaseViewModel {
}
private parseComp(getData: Promise<ResponseDTO<PageDTO>>): Promise<PageDTO> {
Logger.debug(TAG, 'parseComp11111111 ');
return new Promise<PageDTO>((success, error) => {
getData
.then((resDTO: ResponseDTO<PageDTO>) => {
...
...
@@ -225,6 +226,7 @@ export class PageViewModel extends BaseViewModel {
}
async getPageInfo(pageId: string): Promise<PageInfoDTO> {
Logger.info(TAG, "getPageInfo:" + pageId);
return new Promise<PageInfoDTO>((success, error) => {
PageRepository.fetchPageData(pageId).then((resDTO: ResponseDTO<PageInfoDTO>) => {
if (!resDTO || !resDTO.data) {
...
...
@@ -235,6 +237,9 @@ export class PageViewModel extends BaseViewModel {
Logger.info(TAG, "getPageInfo then,resDTO.timeStamp:" + resDTO.timestamp);
resDTO.data.md5 = resDTO.meta?.md5 || ''
success(resDTO.data as PageInfoDTO);
}).catch((err: Error) => {
Logger.error(TAG, `getPageInfo then,error.name : ${err.name}, error.message:${err.message}`);
error(err);
});
});
}
...
...
Please
register
or
login
to post a comment