ref |> 解决桌面组件widgets间接引用wdComponent中的AudioCapture导致崩溃

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>

 import { CompInfoBean, ContentDTO, PageInfoBean } from 'wdBean/Index';
 import { CompInfoBean, ContentDTO, PageInfoBean } from 'wdBean/Index';
-import { MorningEveningViewModel } from 'wdComponent/Index';
+// import { MorningEveningViewModel } from 'wdComponent/Index';
 import { CrptoUtils, FileUtils, Logger } from 'wdKit/Index';
 import { CrptoUtils, FileUtils, Logger } from 'wdKit/Index';
 import { FormNewspaperPaperType, FormNewspaperPaperContent,
 import { FormNewspaperPaperType, FormNewspaperPaperContent,
   FormNewspaperData } from "../dailynewspaperwidget/common/NewspaperWidgetData"
   FormNewspaperData } from "../dailynewspaperwidget/common/NewspaperWidgetData"
@@ -8,6 +8,7 @@ import fs from '@ohos.file.fs';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { JSON } from '@kit.ArkTS';
 import { JSON } from '@kit.ArkTS';
 import { AppInnerLinkGenerator } from 'wdRouter';
 import { AppInnerLinkGenerator } from 'wdRouter';
+import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 
 
 const TAG = "NewspaperDataFetcher"
 const TAG = "NewspaperDataFetcher"
 
 
@@ -22,11 +23,11 @@ export class NewspaperDataFetcher {
       data.paperInfo = {  showLeftImage: false }
       data.paperInfo = {  showLeftImage: false }
 
 
       try {
       try {
-        let page: PageInfoBean = await MorningEveningViewModel.getDailyPaperTopic()
+        let page: PageInfoBean = await NewspaperDataFetcher.getDailyPaperTopic()
         data.paperType = page.topicInfo?.topicPattern || FormNewspaperPaperType.unknown
         data.paperType = page.topicInfo?.topicPattern || FormNewspaperPaperType.unknown
 
 
         let currentTime = new Date().getTime()
         let currentTime = new Date().getTime()
-        let compInfo = await MorningEveningViewModel.getMorningEveningCompInfo(
+        let compInfo = await NewspaperDataFetcher.getMorningEveningCompInfo(
           page.id,
           page.id,
           page.groups[0]?.id,
           page.groups[0]?.id,
           currentTime + "",
           currentTime + "",
@@ -208,5 +209,62 @@ export class NewspaperDataFetcher {
     })
     })
   }
   }
 
 
+  static async getDailyPaperTopic(): Promise<PageInfoBean> {
+    return new Promise<PageInfoBean>((success, error) => {
+      Logger.info(TAG, `getDailyPaperTopic pageInfo start`);
+
+      let url = HttpUrlUtils.getHost() + HttpUrlUtils.DAILY_PAPER_TOPIC;
+      WDHttp.get<ResponseDTO<PageInfoBean>>(url).then((resDTO: ResponseDTO<PageInfoBean>) => {
+          if (!resDTO || !resDTO.data) {
+            Logger.error(TAG, 'getDailyPaperTopic then navResDTO is empty');
+            error('resDTO is empty');
+            return
+          }
+          if (resDTO.code != 0) {
+            Logger.error(TAG, `getDailyPaperTopic then code:${resDTO.code}, message:${resDTO.message}`);
+            error('resDTO Response Code is failure');
+            return
+          }
+          // let navResStr = JSON.stringify(navResDTO);
+          Logger.info(TAG, "getDailyPaperTopic then,navResDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `getDailyPaperTopic catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
+    })
+  }
+
+  static async getMorningEveningCompInfo(pageId: number, groupId: number, refreshTime: string, topicId: string, pageNum: number = 1, pageSize: number = 20): Promise<CompInfoBean> {
+    return new Promise<CompInfoBean>((success, error) => {
+      Logger.info(TAG, `getMorningEveningCompInfo pageInfo start`);
+
+      let url = HttpUrlUtils.getHost() + HttpUrlUtils.COMP_PATH;
+      url = url + "?loadStrategy=first_load&pageNum=" + pageNum + "&refreshTime=" + refreshTime + "&pageId="
+        + pageId + "&channelStrategy=2&groupId=" + groupId + "&topicId=" + topicId + "&pageSize=" + pageSize;
+
+      WDHttp.get<ResponseDTO<CompInfoBean>>(url).then((resDTO: ResponseDTO<CompInfoBean>) => {
+          if (!resDTO || !resDTO.data) {
+            Logger.error(TAG, 'getMorningEveningCompInfo then navResDTO is empty');
+            error('resDTO is empty');
+            return
+          }
+          if (resDTO.code != 0) {
+            Logger.error(TAG, `getMorningEveningCompInfo then code:${resDTO.code}, message:${resDTO.message}`);
+            error('resDTO Response Code is failure');
+            return
+          }
+          // let navResStr = JSON.stringify(navResDTO);
+          Logger.info(TAG, "getMorningEveningCompInfo then,navResDTO.timestamp:" + resDTO.timestamp);
+          success(resDTO.data);
+        })
+        .catch((err: Error) => {
+          Logger.error(TAG, `getMorningEveningCompInfo catch, error.name : ${err.name},  error.message:${err.message}`);
+          error(err);
+        })
+    })
+  }
+
 
 
 }
 }