update

src/context/locales/en.js

@@ -80,7 +80,7 @@ export default {
         },
         auth: {
             agreement: 'I have read and agreed to the User Agreement and Privacy Policy',
-            psd_repeat_diff:'两次密码输入不一致'
+            psd_repeat_diff:'Passwords do not match.'
         },
         records_history: {
             time_title: 'History',

src/features/trackTimeDuration/components/WeekCalendarItem.tsx

@@ -55,37 +55,19 @@ export default function WeekCalendarItem(props: { data: any, isCurrentWeek: bool
                 var real_start = item.real_start_time
                 var real_end = item.real_end_time
 
-                if (item.real_end_timezone && item.real_end_timezone.id) {
+                
 
+                //睡眠数据下，以fast_end为准
+                if (item.fast_real_end_timezone && item.fast_real_end_timezone.id){
+                    var strEnd = TimeFormatter.tzTimeFormateLocalTime(real_end, item.fast_real_end_timezone.id,'YYYY-MM-DDTHH:mm:ss')
+                    var duration = real_end - real_start
+                    real_end = new Date(strEnd).getTime()
+                    real_start = real_end - duration
+                }
 
-                    // var strEnd = dayjs(real_end).tz(item.real_end_timezone.id).format('YYYY-MM-DDTHH:mm:ss')
+                else if (item.real_end_timezone && item.real_end_timezone.id) {
                     var strEnd = TimeFormatter.tzTimeFormateLocalTime(real_end, item.real_end_timezone.id,'YYYY-MM-DDTHH:mm:ss')
                     var duration = real_end - real_start
-                    // if (index = 1) {
-                    //     if (new Date(strEnd)) {
-                    //         // 示例字符串
-                    //         var isoString = '2021-04-01T15:20:00';
-
-                    //         // 将字符串转换为Date对象
-                    //         var date = new Date(strEnd);
-
-                    //         showAlert({
-                    //             title: strEnd,
-                    //             content: date.getTime()+''
-                    //         })
-                    //     }
-                    //     else {
-                    //         showAlert({
-                    //             title: strEnd,
-                    //             content: '转换失败'
-                    //         })
-                    //     }
-
-                    // }
-
-
-
-
                     real_end = new Date(strEnd).getTime()
                     real_start = real_end - duration
                 }
@@ -107,6 +89,7 @@ export default function WeekCalendarItem(props: { data: any, isCurrentWeek: bool
                         })
                     }
                     else {
+                        debugger
                         sleeps.push({
                             begin, height
                         })

src/features/trackTimeDuration/hooks/RingData.tsx

@@ -307,7 +307,11 @@ export const getReal = (data: any, isBigRing: boolean, isRecord: boolean) => {
     if (isBigRing) {
         if (data.scenario == 'SLEEP') {
             realRingBig.color = global.sleepColor ? global.sleepColor : ColorType.sleep
-            if (data.sleep.real_end_timezone && data.sleep.real_end_timezone.gmt && data.status == 'COMPLETED') {
+            if (data.sleep.fast_real_end_timezone && data.sleep.fast_real_end_timezone.gmt && data.status == 'COMPLETED') {
+                var timestamp = TimeFormatter.transferTimestamp(data.sleep.real_start_time, data.sleep.fast_real_end_timezone.gmt)
+                realRingBig.startArc = startArc(timestamp)
+            }
+            else if (data.sleep.real_end_timezone && data.sleep.real_end_timezone.gmt && data.status == 'COMPLETED') {
                 var timestamp = TimeFormatter.transferTimestamp(data.sleep.real_start_time, data.sleep.real_end_timezone.gmt)
                 realRingBig.startArc = startArc(timestamp)
             }

src/services/http/request.ts

@@ -108,7 +108,7 @@ export async function request<T>(param: RequestParam): Promise<T> {
             }
             if (process.env.TARO_ENV == 'rn' && (param.data as any).showAlert) {
                 showAlert({
-                    title: 'error',
+                    title: 'Error',
                     content: global.language == 'en' ? 'Posting failed. Please check your network.' : '操作失败，请检查网络',
                     showCancel: false
                 })
@@ -172,7 +172,7 @@ export async function request<T>(param: RequestParam): Promise<T> {
                     if (statusCode == 502) {
                         if (process.env.TARO_ENV == 'rn' && (param.data as any).showAlert) {
                             showAlert({
-                                title: 'error',
+                                title: 'Error',
                                 content: global.language == 'en' ? 'Server is busy now. Please try again later.' : '服务器正忙, 请您稍后再试。',
                                 showCancel: false
                             })
@@ -188,7 +188,7 @@ export async function request<T>(param: RequestParam): Promise<T> {
                     else {
                         if (process.env.TARO_ENV == 'rn' && (param.data as any).showAlert) {
                             showAlert({
-                                title: 'error',
+                                title: 'Error',
                                 content: data.error_message,
                                 showCancel: false
                             })