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

@@ -117,7 +117,8 @@ export struct ImageAndTextPageComponent {
                     if (this.likeNum > 0) {
                       Text(NumberFormatterUtils.formatNumberWithWan(this.likeNum))
                         .fontSize(16)
-                        .fontColor(this.newsStatusOfUser?.likeStatus == '1' ? '#ED2800' : '#999999')
+                        //.fontColor(this.newsStatusOfUser?.likeStatus == '1' ? '#ED2800' : '#999999')
+                        .fontColor((this.likeNumTextColor()))
                         .fontFamily('PingFang SC-Regular')
                         .fontWeight(400)
                         .margin({ left: 5 })
@@ -267,6 +268,14 @@ export struct ImageAndTextPageComponent {
     .backgroundColor(Color.White)
   }
 
+  private likeNumTextColor() {
+    if(this.newsStatusOfUser?.likeStatus == '1'){
+      //已点赞状态  祈福和默哀为黑色  其余为红色
+      return (this.contentDetailData?.likesStyle == 2 || this.contentDetailData?.likesStyle == 3) ? '#222222' : '#ED2800'
+    }
+    return '#999999'
+  }
+
   private async getDetail() {
     this.isNetConnected = NetworkUtil.isNetConnected()
     if (!this.isNetConnected) {

@@ -242,7 +242,7 @@ export struct MorningEveningPaperComponent {
     if (imageSource) {
       const pixelMap: image.PixelMap = await imageNet2PixelMap(imageSource);
       effectKit.createColorPicker(pixelMap, (err, colorPicker) => {
-        let color = colorPicker.getMainColorSync();
+        let color = colorPicker.getLargestProportionColor();
         console.log(TAG, "compInfoBean compStyle = " + color)
         // color = ColorUtils.getMorningEveningPaperRgb({red:color.red,green:color.green,blue:color.blue,alpha:color.alpha})
         // 将取色器选取的color示例转换为十六进制颜色代码

@@ -200,12 +200,13 @@ export struct AppointmentListUI {
       let time = arr[0].split("-");
       if (time.length === 3) {
         let month = time[1].indexOf("0") === 0 ? time[1].substring(1) : time[1]
-        let day = time[2]
+        // let day = time[2]
+        let day = time[2].indexOf("0") === 0 ? time[2].substring(1) : time[2]
 
         dealData[0] = `${month}月${day}日`
         let today = `${new Date().getMonth() + 1}月${new Date().getDate()}日`
         if (dealData[0] === today) {
-          dealData[0] = "今日"
+          dealData[0] = "今天"
         }
       }
     }

@@ -15,6 +15,7 @@ import { TrackConstants } from 'wdTracking/Index';
 import { SPHelper } from 'wdKit/Index';
 import { SpConstants } from 'wdConstant/Index';
 import { photoPickerUtils} from '../../utils/PhotoPickerUtils';
+import { cameraPickerUtils } from '../../utils/CameraPickerUtils';
 
 @Entry
 @Component
@@ -104,7 +105,7 @@ struct EditUserInfoPage {
         }
       })
     }else {
-      photoPickerUtils.getCamera().then(value => {
+      cameraPickerUtils.getCamera().then(value => {
         if (value.length > 0) {
           this.headerImg = value
         }

+import { abilityAccessCtrl, common, Permissions } from '@kit.AbilityKit';
+import { camera, cameraPicker as picker } from '@kit.CameraKit';
+let mContext = getContext(this) as common.Context;
+
+const PERMISSIONS: Array<Permissions> = [
+  'ohos.permission.READ_IMAGEVIDEO',
+];
+
+export class  CameraPickerUtils {
+  async getCamera(){
+    this.pickerPermissions()
+
+    let pickerProfile: picker.PickerProfile = {
+      cameraPosition: camera.CameraPosition.CAMERA_POSITION_BACK
+    };
+    let pickerResult: picker.PickerResult = await picker.pick(mContext,
+      [picker.PickerMediaType.PHOTO], pickerProfile);
+
+    return new Promise<string>((success, fail) => {
+      if (pickerResult['resultCode'] === 0) {
+        success(pickerResult['resultUri'])
+      }
+    })
+  }
+
+  async pickerPermissions(){
+    ///权限查询
+    const context = getContext(this) as common.UIAbilityContext;
+    const atManager = abilityAccessCtrl.createAtManager();
+    await atManager.requestPermissionsFromUser(context, PERMISSIONS);
+  }
+
+}
+
+export const cameraPickerUtils: CameraPickerUtils = new CameraPickerUtils();
\ No newline at end of file

@@ -30,21 +30,21 @@ export class  PhotoPickerUtils {
     })
   }
 
-  async getCamera(){
-    this.pickerPermissions()
-
-    let pickerProfile: cameraPicker.PickerProfile = {
-      cameraPosition: camera.CameraPosition.CAMERA_POSITION_BACK
-    };
-    let pickerResult: cameraPicker.PickerResult = await cameraPicker.pick(mContext,
-      [cameraPicker.PickerMediaType.PHOTO, cameraPicker.PickerMediaType.VIDEO], pickerProfile);
-
-    return new Promise<string>((success, fail) => {
-      if (pickerResult['resultCode'] === 0) {
-        success(pickerResult['resultUri'])
-      }
-    })
-  }
+  // async getCamera(){
+  //   this.pickerPermissions()
+  //
+  //   let pickerProfile: cameraPicker.PickerProfile = {
+  //     cameraPosition: camera.CameraPosition.CAMERA_POSITION_BACK
+  //   };
+  //   let pickerResult: cameraPicker.PickerResult = await cameraPicker.pick(mContext,
+  //     [cameraPicker.PickerMediaType.PHOTO, cameraPicker.PickerMediaType.VIDEO], pickerProfile);
+  //
+  //   return new Promise<string>((success, fail) => {
+  //     if (pickerResult['resultCode'] === 0) {
+  //       success(pickerResult['resultUri'])
+  //     }
+  //   })
+  // }
 
   async pickerPermissions(){
     ///权限查询