Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -237,14 +237,13 @@ export struct MorningEveningPaperComponent {
     if (imageSource) {
     if (imageSource) {
       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.getLargestProportionColor();
+        let color = colorPicker.getMainColorSync();
         console.log(TAG, "compInfoBean compStyle = " + color)
         console.log(TAG, "compInfoBean compStyle = " + color)
         // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
         // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
         // 将取色器选取的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);
         console.log(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
         console.log(TAG, "compInfoBean compStyle = " + this.mixedBgColor)
       });
       });
-
     }
     }
   }
   }
 
 

@@ -98,18 +98,18 @@ export struct PaperTitleComponent {
         })
         })
         .margin({ right: 16 })
         .margin({ right: 16 })
 
 
-      Image($r('app.media.icon_share'))
-        .height($r('app.float.top_arrow_size'))
-        .width($r('app.float.top_arrow_size'))
-        .alignRules({
-          right: { anchor: "img_close", align: HorizontalAlign.Start },
-          center: { anchor: "__container__", align: VerticalAlign.Center }
-        })
-        .id('img_share')
-        .margin({ right: 16 })
-        .onClick(() => {
-          this.share()
-        })
+      // Image($r('app.media.icon_share'))
+      //   .height($r('app.float.top_arrow_size'))
+      //   .width($r('app.float.top_arrow_size'))
+      //   .alignRules({
+      //     right: { anchor: "img_close", align: HorizontalAlign.Start },
+      //     center: { anchor: "__container__", align: VerticalAlign.Center }
+      //   })
+      //   .id('img_share')
+      //   .margin({ right: 16 })
+      //   .onClick(() => {
+      //     this.share()
+      //   })
     }
     }
     // .margin({ left: 14, right: 14 })
     // .margin({ left: 14, right: 14 })
     .height($r('app.float.top_bar_height'))
     .height($r('app.float.top_bar_height'))

@@ -2,14 +2,15 @@ import { ENewspaperPageComponent } from 'wdComponent';
 import { DateTimeUtils, Logger } from 'wdKit';
 import { DateTimeUtils, Logger } from 'wdKit';
 import common from '@ohos.app.ability.common';
 import common from '@ohos.app.ability.common';
 import window from '@ohos.window';
 import window from '@ohos.window';
-import { TrackingPageBrowse ,TrackConstants} from 'wdTracking/Index';
+import { TrackingPageBrowse, TrackConstants } from 'wdTracking/Index';
 
 
 const TAG = 'ENewspaper';
 const TAG = 'ENewspaper';
+
 //电子报主页面
 //电子报主页面
 @Entry
 @Entry
 @Component
 @Component
 struct ENewspaper {
 struct ENewspaper {
-  pageShowTime:number = 0;
+  pageShowTime: number = 0;
   // 获取UIAbility上下文
   // 获取UIAbility上下文
   context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
   context: common.UIAbilityContext = getContext(this) as common.UIAbilityContext
 
 
@@ -49,15 +50,16 @@ struct ENewspaper {
 
 
   onPageShow() {
   onPageShow() {
     this.pageShowTime = DateTimeUtils.getTimeStamp()
     this.pageShowTime = DateTimeUtils.getTimeStamp()
-    this.setSystemBar('#80000000','#80000000', '#FFFFFFFF')
+    this.setSystemBar('#00000000', '#00000000', '#FFFFFFFF')
     Logger.info(TAG, 'onPageShow');
     Logger.info(TAG, 'onPageShow');
   }
   }
 
 
   onPageHide() {
   onPageHide() {
-    this.setSystemBar('#FFFFFFFF','#00000000', '#000000')
+    this.setSystemBar('#FFFFFFFF', '#00000000', '#000000')
     Logger.info(TAG, 'onPageHide');
     Logger.info(TAG, 'onPageHide');
     //页面浏览
     //页面浏览
-    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.NewsPaperPage,TrackConstants.PageName.NewsPaperPage,Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime)/1000))
+    TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.NewsPaperPage,
+      TrackConstants.PageName.NewsPaperPage, Math.floor((DateTimeUtils.getTimeStamp() - this.pageShowTime) / 1000))
   }
   }
 
 
   onBackPress() {
   onBackPress() {

@@ -14,6 +14,19 @@
       }
       }
     },
     },
     {
     {
+      "intentName": "ViewColumn",
+      "domain": "",
+      "intentVersion": "1.0.1",
+      "srcEntry": "./ets/utils/InsightIntentExecutorImpl.ets",
+      "uiAbility": {
+        "ability": "EntryAbility",
+        "executeMode": [
+          "background",
+          "foreground"
+        ]
+      }
+    },
+    {
       "intentName": "ViewColumnUpdate",
       "intentName": "ViewColumnUpdate",
       "domain": "",
       "domain": "",
       "intentVersion": "1.0.1",
       "intentVersion": "1.0.1",