Showing
3 changed files
with
15 additions
and
3 deletions
| @@ -169,8 +169,6 @@ export class BridgeWebViewControl extends webview.WebviewController { | @@ -169,8 +169,6 @@ export class BridgeWebViewControl extends webview.WebviewController { | ||
| 169 | // messageJson = messageJson.replace("%7B", encodeURIComponent("%7B")); | 169 | // messageJson = messageJson.replace("%7B", encodeURIComponent("%7B")); |
| 170 | // messageJson = messageJson.replace("%7D", encodeURIComponent("%7D")); | 170 | // messageJson = messageJson.replace("%7D", encodeURIComponent("%7D")); |
| 171 | // messageJson = messageJson.replace("%22", encodeURIComponent("%22")); | 171 | // messageJson = messageJson.replace("%22", encodeURIComponent("%22")); |
| 172 | - // 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"); | ||
| 173 | - | ||
| 174 | 172 | ||
| 175 | let javascriptCommand: string = StringUtils.formatStringForJS(BridgeUtil.JS_HANDLE_MESSAGE_FROM_JAVA, messageJson); | 173 | let javascriptCommand: string = StringUtils.formatStringForJS(BridgeUtil.JS_HANDLE_MESSAGE_FROM_JAVA, messageJson); |
| 176 | // hilog.error(0xFF00, TAG, 'dispatchMessage111 '+ javascriptCommand.slice(0,2000)); | 174 | // hilog.error(0xFF00, TAG, 'dispatchMessage111 '+ javascriptCommand.slice(0,2000)); |
| @@ -54,7 +54,15 @@ export struct PageComponent { | @@ -54,7 +54,15 @@ export struct PageComponent { | ||
| 54 | emptyType: this.pageModel.emptyType, | 54 | emptyType: this.pageModel.emptyType, |
| 55 | emptyButton: true, | 55 | emptyButton: true, |
| 56 | retry: () => { | 56 | retry: () => { |
| 57 | + this.pageModel.viewType = ViewType.LOADING; | ||
| 57 | this.getData() | 58 | this.getData() |
| 59 | + // this.pageModel.pageId = this.pageId; | ||
| 60 | + // this.pageModel.groupId = this.pageId; | ||
| 61 | + // this.pageModel.channelId = this.channelId; | ||
| 62 | + // this.pageModel.currentPage = 1; | ||
| 63 | + // this.pageModel.pageTotalCompSize = 0; | ||
| 64 | + // this.listScroller.scrollToIndex(0) | ||
| 65 | + // autoRefresh(this.pageModel, this.pageAdvModel) | ||
| 58 | } | 66 | } |
| 59 | }) | 67 | }) |
| 60 | .backgroundColor(Color.White) | 68 | .backgroundColor(Color.White) |
| @@ -277,6 +285,7 @@ export struct PageComponent { | @@ -277,6 +285,7 @@ export struct PageComponent { | ||
| 277 | Logger.info(TAG, | 285 | Logger.info(TAG, |
| 278 | `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`); | 286 | `onChangezz id: ${this.pageId} , ${this.channelId} , ${this.navIndex} , navIndex: ${this.currentTopNavSelectedIndex}`); |
| 279 | if (this.navIndex === this.currentTopNavSelectedIndex) { | 287 | if (this.navIndex === this.currentTopNavSelectedIndex) { |
| 288 | + Logger.debug(TAG, 'page onAutoRefresh111 ' + this.needload) | ||
| 280 | if (this.needload) { | 289 | if (this.needload) { |
| 281 | this.getData(); | 290 | this.getData(); |
| 282 | } | 291 | } |
| @@ -66,7 +66,7 @@ export class PageViewModel extends BaseViewModel { | @@ -66,7 +66,7 @@ export class PageViewModel extends BaseViewModel { | ||
| 66 | * @returns | 66 | * @returns |
| 67 | */ | 67 | */ |
| 68 | async getPageGroupCompData(pageModel: PageUIReqBean): Promise<PageDTO> { | 68 | async getPageGroupCompData(pageModel: PageUIReqBean): Promise<PageDTO> { |
| 69 | - Logger.debug(TAG, 'getPageData pageId: ' + pageModel.pageId); | 69 | + Logger.debug(TAG, 'getPageGroupCompData pageId: ' + pageModel.pageId); |
| 70 | if (pageModel.isRecGroup) { | 70 | if (pageModel.isRecGroup) { |
| 71 | return this.parseComp(PageRepository.fetchRecCompData(pageModel)) | 71 | return this.parseComp(PageRepository.fetchRecCompData(pageModel)) |
| 72 | } else { | 72 | } else { |
| @@ -75,6 +75,7 @@ export class PageViewModel extends BaseViewModel { | @@ -75,6 +75,7 @@ export class PageViewModel extends BaseViewModel { | ||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | private parseComp(getData: Promise<ResponseDTO<PageDTO>>): Promise<PageDTO> { | 77 | private parseComp(getData: Promise<ResponseDTO<PageDTO>>): Promise<PageDTO> { |
| 78 | + Logger.debug(TAG, 'parseComp11111111 '); | ||
| 78 | return new Promise<PageDTO>((success, error) => { | 79 | return new Promise<PageDTO>((success, error) => { |
| 79 | getData | 80 | getData |
| 80 | .then((resDTO: ResponseDTO<PageDTO>) => { | 81 | .then((resDTO: ResponseDTO<PageDTO>) => { |
| @@ -225,6 +226,7 @@ export class PageViewModel extends BaseViewModel { | @@ -225,6 +226,7 @@ export class PageViewModel extends BaseViewModel { | ||
| 225 | } | 226 | } |
| 226 | 227 | ||
| 227 | async getPageInfo(pageId: string): Promise<PageInfoDTO> { | 228 | async getPageInfo(pageId: string): Promise<PageInfoDTO> { |
| 229 | + Logger.info(TAG, "getPageInfo:" + pageId); | ||
| 228 | return new Promise<PageInfoDTO>((success, error) => { | 230 | return new Promise<PageInfoDTO>((success, error) => { |
| 229 | PageRepository.fetchPageData(pageId).then((resDTO: ResponseDTO<PageInfoDTO>) => { | 231 | PageRepository.fetchPageData(pageId).then((resDTO: ResponseDTO<PageInfoDTO>) => { |
| 230 | if (!resDTO || !resDTO.data) { | 232 | if (!resDTO || !resDTO.data) { |
| @@ -235,6 +237,9 @@ export class PageViewModel extends BaseViewModel { | @@ -235,6 +237,9 @@ export class PageViewModel extends BaseViewModel { | ||
| 235 | Logger.info(TAG, "getPageInfo then,resDTO.timeStamp:" + resDTO.timestamp); | 237 | Logger.info(TAG, "getPageInfo then,resDTO.timeStamp:" + resDTO.timestamp); |
| 236 | resDTO.data.md5 = resDTO.meta?.md5 || '' | 238 | resDTO.data.md5 = resDTO.meta?.md5 || '' |
| 237 | success(resDTO.data as PageInfoDTO); | 239 | success(resDTO.data as PageInfoDTO); |
| 240 | + }).catch((err: Error) => { | ||
| 241 | + Logger.error(TAG, `getPageInfo then,error.name : ${err.name}, error.message:${err.message}`); | ||
| 242 | + error(err); | ||
| 238 | }); | 243 | }); |
| 239 | }); | 244 | }); |
| 240 | } | 245 | } |
-
Please register or login to post a comment