Merge remote-tracking branch 'origin/main'

@@ -16,7 +16,7 @@ import { topicInfoView } from './topicInfoView';
 import { DateFormatUtil, PlayerConstants, WDPlayerController } from 'wdPlayer';
 import { DateFormatUtil, PlayerConstants, WDPlayerController } from 'wdPlayer';
 import { AudioDataList } from 'wdBean/src/main/ets/bean/morningevening/AudioDataList';
 import { AudioDataList } from 'wdBean/src/main/ets/bean/morningevening/AudioDataList';
 import { image } from '@kit.ImageKit';
 import { image } from '@kit.ImageKit';
-import { getPicture, imageNet2PixelMap } from '../../utils/ImageUtils';
+import { findMaxPixel, getPicture, imageNet2PixelMap, traverseAllPixel } from '../../utils/ImageUtils';
 import { effectKit } from '@kit.ArkGraphics2D';
 import { effectKit } from '@kit.ArkGraphics2D';
 import { window } from '@kit.ArkUI';
 import { window } from '@kit.ArkUI';
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
 import { PeopleShipMainViewModel } from '../../viewmodel/PeopleShipMainViewModel';
@@ -25,7 +25,7 @@ import { viewColumInsightIntentShare } from '../../utils/InsightIntentShare'
 import { common } from '@kit.AbilityKit';
 import { common } from '@kit.AbilityKit';
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
 import {TrackConstants,TrackParamConvert}from 'wdTracking/Index'
-import { ColorUtils } from '../../utils/ColorUtils';
+import { ColorHsv, ColorRgb, ColorUtils } from '../../utils/ColorUtils';
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
 import { EmptyComponent,WDViewDefaultType } from '../view/EmptyComponent';
 import { EmitterEventId, EmitterUtils } from 'wdKit/Index'
 import { EmitterEventId, EmitterUtils } from 'wdKit/Index'
 
 
@@ -238,14 +238,20 @@ export struct MorningEveningPaperComponent {
   private async pickColor(imageSource: image.ImageSource | undefined) {
   private async pickColor(imageSource: image.ImageSource | undefined) {
     if (imageSource) {
     if (imageSource) {
       const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
       const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
-      effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
-        let color = colorPicker.getMainColorSync();
-        console.log(TAG, "compInfoBean compStyle = " + color)
-        // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
-        // 将取色器选取的color示例转换为十六进制颜色代码
-        this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
-        console.log(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
-      });
+      let allPixels: number[] = await traverseAllPixel(pixelMap);
+      let maxPixel: number = findMaxPixel(allPixels);
+      let rgb: ColorRgb = ColorUtils.numberToRgb(maxPixel);
+      let hsv: ColorHsv = ColorUtils.rgb2hsv(rgb);
+      rgb = ColorUtils.hsv2rgb(hsv);
+      this.mixedBgColor = "#" + rgb.red.toString(16) + rgb.green.toString(16) + rgb.blue.toString(16);
+      // effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
+      //   let color = colorPicker.getMainColorSync();
+      //   console.log(TAG, "compInfoBean compStyle = " + color)
+      //   // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
+      //   // 将取色器选取的color示例转换为十六进制颜色代码
+      //   this.mixedBgColor = "#" + color.alpha.toString(16) + color.red.toString(16) + color.green.toString(16) + color.blue.toString(16);
+      //   console.log(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
+      // });
     }
     }
   }
   }