cjb před 2 týdny
rodič
revize
e95ded6d89

+ 11 - 4
entry/src/main/ets/component/TimeAndTitle.ets

@@ -2,10 +2,12 @@ import TimeUtil from "../common/util/TimeUtil"
 @Component
 export struct TimeAndTitle {
   @State currentTime: string = TimeUtil.getHourAndMinute(); // 响应式时间数据
+  @State timePeriod: string = TimeUtil.getTimePeriod();
+  @State dateAndWeek: string = TimeUtil.getDateAndWeek();
   private timerID: number | undefined; // 定时器ID
   aboutToAppear() {
     this.timerID = setInterval(() => {
-      this.currentTime = TimeUtil.getHourAndMinute(); // 每秒更新
+     this.updateAllTime(); // 每秒更新
     }, 1000);
   }
   aboutToDisappear() {
@@ -13,19 +15,24 @@ export struct TimeAndTitle {
       clearInterval(this.timerID);
     }
   }
+  private updateAllTime() {
+    this.currentTime = TimeUtil.getHourAndMinute();
+    this.timePeriod = TimeUtil.getTimePeriod();
+    this.dateAndWeek = TimeUtil.getDateAndWeek();
+  }
 
   build() {
     Row() {
       Row(){
-      Text(TimeUtil.getDateAndWeek())
+      Text(this.dateAndWeek)
         .fontSize($r('app.float.fontSize_16'))
         .fontColor($r('app.color.FFFFFF'))
         .fontWeight(FontWeight.Lighter)
-      Text(' ' + TimeUtil.getTimePeriod())
+      Text(' ' + this.timePeriod)
         .fontSize($r('app.float.fontSize_16'))
         .fontColor($r('app.color.FFFFFF'))
         .fontWeight(FontWeight.Lighter)
-      Text(' ' + TimeUtil.getHourAndMinute())
+      Text(' ' + this.currentTime)
         .fontSize($r('app.float.fontSize_16'))
         .fontColor($r('app.color.FFFFFF'))
         .fontWeight(FontWeight.Lighter)

+ 1 - 1
entry/src/main/ets/pages/RgvControl.ets

@@ -46,7 +46,7 @@ struct RgvControl {
     ),
     customStyle: true,
     maskColor: 'rgba(0,0,0,0.6)',
-    autoCancel:false
+    //autoCancel:false
   })
   //清除任务
   cleanTask = async () => {

+ 0 - 4
entry/src/main/resources/base/media/wms_confirm_add.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 24 24">
-  <path d="M20.75 11V5.75H3.25v11.5H21.5a.75.75 0 0 1 0 1.5h-19a.75.75 0 0 1-.75-.75V5l.004-.077A.75.75 0 0 1 2.5 4.25h19l.077.004A.75.75 0 0 1 22.25 5v6a.75.75 0 0 1-1.5 0Z"/>
-  <path d="M13.89 10.565a.75.75 0 0 1 1.22.87l-1.653 2.315H21.5a.75.75 0 0 1 0 1.5H12a.75.75 0 0 1-.61-1.185l2.5-3.5ZM13 7.25a.75.75 0 0 1 0 1.5h-2a.75.75 0 0 1 0-1.5h2Zm-5 0a.75.75 0 0 1 0 1.5H6a.75.75 0 0 1 0-1.5h2Z"/>
-</svg>