update

src/features/trackTimeDuration/components/WeekCalendar.tsx

@@ -34,9 +34,13 @@ const WeekCalendar = memo(() => {
     global.refrehWeekly = () => {
         // getRecords()
         if (isLoading) return
-        pageIndex=0;
+        pageIndex = 0;
         setIsLoading(true)
         var timestamp = TimeFormatter.getMondayTimestamp()
+        var now = new Date()
+        if (now.getDay() == 0 && now.getHours() >= 0 && now.getHours() < 12) {
+            timestamp -= 24 * 3600 * 1000 * 7
+        }
         var list: any = []
         var offset = 12 * 3600 * 1000 + pageIndex * pageSize * 24 * 3600 * 1000
         for (var i = 0; i < pageSize; i++) {
@@ -57,9 +61,13 @@ const WeekCalendar = memo(() => {
 
     function getRecords() {
         if (isLoading) return
-        pageIndex=0;
+        pageIndex = 0;
         setIsLoading(true)
         var timestamp = TimeFormatter.getMondayTimestamp()
+        var now = new Date()
+        if (now.getDay() == 0 && now.getHours() >= 0 && now.getHours() < 12) {
+            timestamp -= 24 * 3600 * 1000 * 7
+        }
         var list: any = []
         var offset = 12 * 3600 * 1000 + pageIndex * pageSize * 24 * 3600 * 1000
         for (var i = 0; i < pageSize; i++) {

src/features/trackTimeDuration/components/WeekCalendarItem.tsx

@@ -10,6 +10,21 @@ export default function WeekCalendarItem(props: { data: any, isCurrentWeek: bool
     const [showCurrentTime, setShowCurrentTime] = useState(false)
     const [position, setPosition] = useState({ left: 0, top: 0 })
     useEffect(() => {
+        if (props.isCurrentWeek) {
+            if (timer)
+                clearInterval(timer)
+            if (props.isCurrentWeek) {
+                timer = setInterval(() => {
+                    getPosition()
+                }, 6000)
+                getPosition()
+            }
+            setShowCurrentTime(props.isCurrentWeek)
+        }
+        else {
+            if (timer)
+                clearInterval(timer)
+        }
         var array: any = []
         for (var i = 0; i < 7; i++) {
             var start = props.data.start + 24 * 3600 * 1000 * i
@@ -44,18 +59,19 @@ export default function WeekCalendarItem(props: { data: any, isCurrentWeek: bool
         }
         setCharts(array)
 
-        return ()=>{
+        return () => {
             timer && clearInterval(timer)
         }
     }, [props.data])
 
     useEffect(() => {
+        debugger
         if (timer)
             clearInterval(timer)
         if (props.isCurrentWeek) {
-            timer = setInterval(()=>{
+            timer = setInterval(() => {
                 getPosition()
-            },60000)
+            }, 60000)
             getPosition()
         }
         setShowCurrentTime(props.isCurrentWeek)
@@ -67,6 +83,9 @@ export default function WeekCalendarItem(props: { data: any, isCurrentWeek: bool
         var index = Math.floor((now - start) / (3600 * 24 * 1000))
         var left = (now - start) % (3600 * 24 * 1000)
         var top = left / (3600 * 24 * 1000) * 400
+        if (top >=398){
+            top = 398
+        }
         setPosition({
             left: rpxToPx(94 * index),
             top: rpxToPx(top)

src/pages/clock/Clock.tsx

@@ -103,6 +103,12 @@ export default function Page() {
     useEffect(() => {
         dispatch(staticResources() as any);
         timer = setInterval(() => {
+            var now = new Date()
+            if (now.getDay() == 0 && now.getHours() == 12 && now.getMinutes() == 0 && now.getSeconds() == 0) {
+                if (global.refrehWeekly) {
+                    global.refrehWeekly()
+                }
+            }
             if (global.pauseIndexTimer || pauseTimer) {
                 return
             }
@@ -206,13 +212,13 @@ export default function Page() {
 
     usePageScroll((e) => {
         if (e.scrollTop > 70) {
-          setShowTip(true)
+            setShowTip(true)
         }
         else {
-          setShowTip(false)
+            setShowTip(false)
         }
-    
-      })
+
+    })
 
     useDidHide(() => {
         //pause timer
@@ -237,7 +243,9 @@ export default function Page() {
             key: 'last_tz',
             success: function (res) {
                 if (res.data && res.data != timeZoneFormatted) {
-
+                    if (global.refrehWeekly) {
+                        global.refrehWeekly()
+                    }
                     if (global.currentStatus != 'WAIT_FOR_START') {
                         Taro.showModal({
                             title: t('feature.track_time_duration.change_tz_alert.title'),