Merge remote-tracking branch 'origin/main'

@@ -13,12 +13,9 @@ import { image } from '@kit.ImageKit';
 import { getPicture, imageNet2PixelMap } from '../../utils/ImageUtils';
 import { getPicture, imageNet2PixelMap } from '../../utils/ImageUtils';
 import { effectKit } from '@kit.ArkGraphics2D';
 import { effectKit } from '@kit.ArkGraphics2D';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
-import DailyPaperTopicModel from '../../model/DailyPaperTopicModel'
 
 
 const TAG = 'MorningEveningPaperComponent';
 const TAG = 'MorningEveningPaperComponent';
 
 
-const PATTERN_DATE_CN_RN: string = 'yyyy年\nMM月dd日'; // 日期中包含包含中文年月日
-
 @Entry
 @Entry
 @Component
 @Component
 export struct MorningEveningPaperComponent {
 export struct MorningEveningPaperComponent {
@@ -106,17 +103,12 @@ export struct MorningEveningPaperComponent {
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
     this.topSafeHeight = px2vp(windowHight.getWindowAvoidArea(window.AvoidAreaType.TYPE_SYSTEM).topRect.height)
 
 
-    let dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
+    const dailyPaperTopicPageId = await SPHelper.default.getSync('dailyPaperTopicPageId', "") as String
     console.info(TAG, `aboutToAppear = ` + dailyPaperTopicPageId)
     console.info(TAG, `aboutToAppear = ` + dailyPaperTopicPageId)
     const currentTime = new Date().getTime()
     const currentTime = new Date().getTime()
     Logger.info(TAG, "currentTime = " + currentTime)
     Logger.info(TAG, "currentTime = " + currentTime)
     Logger.info(TAG, `currentTime = ${currentTime}`)
     Logger.info(TAG, `currentTime = ${currentTime}`)
     try {
     try {
-      let dailyPaperTopicBean = await DailyPaperTopicModel.getDailyPaperTopic()
-      if (dailyPaperTopicBean) {
-        dailyPaperTopicPageId = '' + dailyPaperTopicBean.id
-        Logger.info(TAG, "pageID = " + dailyPaperTopicPageId)
-      }
 
 
       // let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId)
       // let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + this.dailyPaperTopicPageId)
       let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + dailyPaperTopicPageId) //"25091"
       let pageInfoBean = await MorningEveningViewModel.getMorningEveningPageInfo("" + dailyPaperTopicPageId) //"25091"
@@ -157,7 +149,10 @@ export struct MorningEveningPaperComponent {
   async setComponentBgColor(imageUrl: string) {
   async setComponentBgColor(imageUrl: string) {
     // 图片转换为PixelMap对象
     // 图片转换为PixelMap对象
     // const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
     // const pixelMap: image.PixelMap = await image2PixelMap(item.icon);
-    const imageSource: image.ImageSource | undefined = await getPicture(imageUrl);
+    Logger.debug(TAG, "compInfoBean compStyle = " + imageUrl)
+
+    const imageSource: image.ImageSource | undefined = await getPicture(imageUrl)
+
     if (imageSource) {
     if (imageSource) {
       this.pickColor(imageSource)
       this.pickColor(imageSource)
 
 
@@ -172,6 +167,8 @@ export struct MorningEveningPaperComponent {
       const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
       const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
       effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
       effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
         let color = colorPicker.getMainColorSync();
         let color = colorPicker.getMainColorSync();
+        Logger.debug(TAG, "compInfoBean compStyle = " + color)
+
         // 将取色器选取的color示例转换为十六进制颜色代码
         // 将取色器选取的color示例转换为十六进制颜色代码
         this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
         this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
         Logger.debug(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
         Logger.debug(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
@@ -212,7 +209,7 @@ export struct MorningEveningPaperComponent {
             })
             })
         }
         }
       }
       }
-      // .backgroundColor('#FFF1F3F5')
+      // .backgroundColor('#fff7b348')
       // .backgroundColor(Color.Blue)
       // .backgroundColor(Color.Blue)
       .height('100%')
       .height('100%')
 
 

@@ -90,7 +90,7 @@ export async function image2PixelMap(icon: string): Promise<image.PixelMap> {
 // 假设http和image是之前正确导入或定义的模块
 // 假设http和image是之前正确导入或定义的模块
 export async function getPicture(imageUrl: string): Promise<image.ImageSource | undefined> {
 export async function getPicture(imageUrl: string): Promise<image.ImageSource | undefined> {
   // const url: string = 'https://rmrbcmsonline.peopleapp.com/upload/image/202312/rmrb_86691703594454.png';
   // const url: string = 'https://rmrbcmsonline.peopleapp.com/upload/image/202312/rmrb_86691703594454.png';
-  const url: string = 'https://rmrbcmsonline.peopleapp.com/upload/image/201912/rmrb_24141576767688.png?x-oss-process=image/resize,w_550/quality,q_90/format,jpg';
+  const url: string = imageUrl;
 
 
   return new Promise((resolve, reject) => {
   return new Promise((resolve, reject) => {
     http.createHttp().request(url, (error: BusinessError, data: http.HttpResponse) => {
     http.createHttp().request(url, (error: BusinessError, data: http.HttpResponse) => {

@@ -2,6 +2,7 @@ import { LiveDetailsBean } from 'wdBean/Index';
 import { StringUtils } from 'wdKit/Index';
 import { StringUtils } from 'wdKit/Index';
 import { WDPlayerController, WDPlayerRenderLiveView } from 'wdPlayer/Index';
 import { WDPlayerController, WDPlayerRenderLiveView } from 'wdPlayer/Index';
 import { PlayUIComponent } from './PlayUIComponent';
 import { PlayUIComponent } from './PlayUIComponent';
+import { Logger } from 'wdKit/Index';
 
 
 @Component
 @Component
 export struct TopPlayComponent {
 export struct TopPlayComponent {
@@ -39,6 +40,7 @@ export struct TopPlayComponent {
       }
       }
       // this.playerController?.firstPlay('https://rmrbcmsonline.peopleapp.com/upload/rmh/video/mp4/202404/1713752415708fb81d0b8f137b.mp4');
       // this.playerController?.firstPlay('https://rmrbcmsonline.peopleapp.com/upload/rmh/video/mp4/202404/1713752415708fb81d0b8f137b.mp4');
       if (StringUtils.isNotEmpty(playUrl)) {
       if (StringUtils.isNotEmpty(playUrl)) {
+        Logger.debug('TopPlayComponent', `${playUrl}`)
         this.playerController?.firstPlay(playUrl);
         this.playerController?.firstPlay(playUrl);
       }
       }
     }
     }