update

android/app/build.gradle

@@ -143,9 +143,12 @@ aaptOptions.useNewCruncher = false
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-
+        manifestPlaceholders = [
+                JPUSH_APPKEY: "7cf918ada725a9e9aecc8a17",         //在此替换你的APPKey
+                JPUSH_CHANNEL: "online"        //在此替换你的channelÏ
+        ]
         if (isNewArchitectureEnabled()) {
             // We configure the CMake build only if you decide to opt-in for the New Architecture.
             externalNativeBuild {
@@ -254,6 +257,8 @@ aaptOptions.useNewCruncher = false
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation project(':jpush-react-native')  // 添加 jpush 依赖
+    implementation project(':jcore-react-native')  // 添加 jcore 依赖
 
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules

android/app/release/output-metadata.json

@@ -4,7 +4,7 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.hola",
+  "applicationId": "com.hye.fast",
   "variantName": "release",
   "elements": [
     {
@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 1,
-      "versionName": "1.0",
+      "versionName": "1.0.1",
       "outputFile": "app-release.apk"
     }
   ],

android/app/src/main/AndroidManifest.xml

@@ -21,6 +21,12 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
+        <meta-data
+            android:name="JPUSH_CHANNEL"
+            android:value="online" />
+        <meta-data
+            android:name="JPUSH_APPKEY"
+            android:value="7cf918ada725a9e9aecc8a17" />
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"

android/app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">hola</string>
+    <string name="app_name">fast16cc</string>
 </resources>

android/gradle.properties

@@ -39,4 +39,4 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # are providing them.
 newArchEnabled=false
 
-app_id=com.hola
+app_id=com.hye.fast

src/components/layout/Modal.weapp.tsx

@@ -34,7 +34,7 @@ export default function Modal(props: {
                 {
                     translateY: animation.interpolate({
                         inputRange: [0, 1],
-                        outputRange: [200, 0],
+                        outputRange: [300, 0],
                     }),
                 },
             ],
@@ -55,6 +55,15 @@ export default function Modal(props: {
         }).start();
     };
 
+    const endAnimation = () => {
+        Animated.spring(animation, {
+            toValue: 0,
+            duration:50,
+            useNativeDriver: true,
+        }).start();
+        console.log('end')
+    };
+
     //阻止中间内容点击事件穿透
     function click(e) {
         if (process.env.TARO_ENV == 'weapp') {
@@ -101,6 +110,17 @@ export default function Modal(props: {
         }, 250)
     }
 
+    function rndismiss(){
+        if (props.modalType == ModalType.center) {
+            props.dismiss()
+            return
+        }
+        endAnimation()
+        setTimeout(() => {
+            props.dismiss()
+        }, 250)
+    }
+
     global.dismissModal = dismiss;
 
     if (process.env.TARO_ENV == 'rn') {
@@ -110,7 +130,7 @@ export default function Modal(props: {
         >
             <View style={{ flex: 1, backgroundColor: '#000000cc' }}>
                 <View style={{ flex: 1, backgroundColor: 'transparent' }} onClick={(e) => {
-                    dismiss()
+                    rndismiss()
                 }}></View>
                 <Animated.View className={isDismiss ? 'modal_bottom_content modal_bottom_dismiss' : 'modal_bottom_content'} 
                 style={[{ flexShrink: 0 },animatedStyle]} onClick={onClick}>

src/features/trackTimeDuration/components/CircadianDetailPopup.tsx

@@ -74,14 +74,14 @@ export default function CircadianDetailPopup(props: { record: any, schedule?: an
         var isMulti = false;
         var tempTZ = '';
         if (props.record.fast) {
-            if (props.record.fast.real_start_timezone.gmt) {
+            if (props.record.fast.real_start_timezone && props.record.fast.real_start_timezone.gmt) {
                 tempTZ = props.record.fast.real_start_timezone.gmt
                 if (props.record.fast.real_start_timezone.gmt != currentTZ) {
                     isDiff = true
                 }
             }
 
-            if (props.record.fast.real_end_timezone.gmt) {
+            if (props.record.fast.real_end_timezone && props.record.fast.real_end_timezone.gmt) {
                 if (tempTZ != props.record.fast.real_end_timezone.gmt) {
                     isMulti = true
                 }
@@ -246,7 +246,7 @@ export default function CircadianDetailPopup(props: { record: any, schedule?: an
 
         var fastRing: RealRing = null
         if (props.record.fast) {
-            var timestamp = TimeFormatter.transferTimestamp(props.record.fast.real_start_time, props.record.fast.real_end_timezone.gmt)
+            var timestamp = TimeFormatter.transferTimestamp(props.record.fast.real_start_time, props.record.fast.real_end_timezone?props.record.fast.real_end_timezone.gmt:'')
             fastRing = {
                 color: global.fastColor ? global.fastColor : ColorType.fast,
                 startArc: startArc(timestamp),//startArc(props.record.fast.real_start_time),

src/features/trackTimeDuration/components/TimelineFastSleep.tsx

@@ -42,7 +42,7 @@ export default function TimelineFastSleep(props: {
             }
             else {
 
-                var real_time_zone = props.data.last_timezone?props.data.last_timezone.gmt:''
+                var real_time_zone = props.data.last_timezone ? props.data.last_timezone.gmt : ''
 
                 var newTimestamp = TimeFormatter.transferTimestamp(obj.target_end_time, real_time_zone)
                 return TimeFormatter.timelineFormatTime(newTimestamp)
@@ -57,7 +57,7 @@ export default function TimelineFastSleep(props: {
                 // return diffTimeZone ? TimeFormatter.timelineFullFormatTime(newTimestamp) : TimeFormatter.timelineFormatTime(obj.real_start_time)
             }
             else {
-                var real_time_zone = props.data.last_timezone?props.data.last_timezone.gmt:''
+                var real_time_zone = props.data.last_timezone ? props.data.last_timezone.gmt : ''
                 var newTimestamp = TimeFormatter.transferTimestamp(obj.target_start_time, real_time_zone)
 
                 return TimeFormatter.timelineFormatTime(newTimestamp)
@@ -68,8 +68,6 @@ export default function TimelineFastSleep(props: {
     }
 
     function formateDate(currentStatus: string, obj: any, isEnd: boolean, isFastMode?: boolean) {
-        var now = new Date()
-        var seconds = now.getHours() * 3600 + now.getMinutes() * 60 + now.getSeconds()
         if (currentStatus == 'WAIT_FOR_START') {
             if (props.data.scenario == 'SLEEP') {
                 if (isEnd) {
@@ -119,7 +117,7 @@ export default function TimelineFastSleep(props: {
                 return TimeFormatter.dateDescription(newTimestamp, true, diffTimeZone || multTimeZone)
             }
             else {
-                var real_time_zone = props.data.last_timezone? props.data.last_timezone.gmt:''
+                var real_time_zone = props.data.last_timezone ? props.data.last_timezone.gmt : ''
                 var newTimestamp = TimeFormatter.transferTimestamp(obj.target_end_time, real_time_zone)
                 if (diffTimeZone || multTimeZone) {
                     return TimeFormatter.getMonthAndDayByTimestamp(newTimestamp, true) + ' '
@@ -136,7 +134,7 @@ export default function TimelineFastSleep(props: {
                 return TimeFormatter.dateDescription(newTimestamp, true, diffTimeZone || multTimeZone)
             }
             else {
-                var real_time_zone = props.data.last_timezone?props.data.last_timezone.gmt:''
+                var real_time_zone = props.data.last_timezone ? props.data.last_timezone.gmt : ''
                 var newTimestamp = TimeFormatter.transferTimestamp(obj.target_start_time, real_time_zone)
                 if (diffTimeZone || multTimeZone) {
                     return TimeFormatter.getMonthAndDayByTimestamp(newTimestamp, true) + ' '
@@ -235,7 +233,7 @@ export default function TimelineFastSleep(props: {
     }
     if (props.data.fast && props.data.scenario != 'SLEEP') {
         var timeZone = ''
-        if (props.data.fast.real_end_timezone.gmt) {
+        if (props.data.fast.real_end_timezone && props.data.fast.real_end_timezone.gmt) {
             timeZone = ' ' + props.data.fast.real_end_timezone.gmt
         }
         if (props.data.status != 'WAIT_FOR_START' && props.data.status != 'COMPLETED') {
@@ -268,15 +266,15 @@ export default function TimelineFastSleep(props: {
 
     function getTZLocation() {
         if (props.data.fast) {
-            var name = props.data.fast.real_start_timezone.gmt
-            if (props.data.fast.real_start_timezone.name) {
+            var name = props.data.fast.real_start_timezone ? props.data.fast.real_start_timezone.gmt : ''
+            if (props.data.fast.real_start_timezone && props.data.fast.real_start_timezone.name) {
                 name = `${name} (${props.data.fast.real_start_timezone.name})`
             }
             return name
         }
         else {
-            var name = props.data.sleep.real_start_timezone.gmt
-            if (props.data.sleep.real_start_timezone.name) {
+            var name = props.data.sleep.real_start_timezone ? props.data.sleep.real_start_timezone.gmt : ''
+            if (props.data.sleep.real_start_timezone && props.data.sleep.real_start_timezone.name) {
                 name = `${name} (${props.data.sleep.real_start_timezone.name})`
             }
             return name
@@ -294,7 +292,7 @@ export default function TimelineFastSleep(props: {
         var current1 = dayjs()
         var current
         if (props.data.fast) {
-            if (props.data.fast.real_start_timezone.id) {
+            if (props.data.fast.real_start_timezone && props.data.fast.real_start_timezone.id) {
                 current = dayjs().tz(props.data.fast.real_start_timezone.id)
                 offset = current.date() * 24 * 60 + current.hour() * 60 + current.minute() - current1.date() * 24 * 60 - current1.hour() * 60 - current1.minute()
             }
@@ -303,7 +301,7 @@ export default function TimelineFastSleep(props: {
             }
         }
         else {
-            if (props.data.sleep.real_start_timezone.id) {
+            if (props.data.sleep.real_start_timezone && props.data.sleep.real_start_timezone.id) {
                 current = dayjs().tz(props.data.sleep.real_start_timezone.id)
                 offset = current.date() * 24 * 60 + current.hour() * 60 + current.minute() - current1.date() * 24 * 60 - current1.hour() * 60 - current1.minute()
             }

src/pages/clock/Clock.tsx

@@ -18,7 +18,7 @@ import { bigRingRadius, getBgRing, getCommon, getDot, getSchedule, ringWidth, sm
 import { RealRing, CurrentDot } from "@/features/trackTimeDuration/components/Rings";
 import IndexConsole from "@/features/trackTimeDuration/components/IndexConsole";
 import Modal from '@/components/layout/Modal'
-import { compareVersion, getTimezone, rpxToPx } from "@/utils/tools";
+import { compareVersion, getTimezone, getTimezoneName, rpxToPx } from "@/utils/tools";
 import RecordFastSleep from "@/features/trackTimeDuration/components/RecordFastSleep";
 import DayLight from "@/features/trackTimeDuration/components/DayLight";
 import { getInfo, latestLocation } from "@/services/user";
@@ -125,7 +125,7 @@ export default function Page() {
     }
 
     useEffect(() => {
-        
+
         dispatch(staticResources() as any);
         timer = setInterval(() => {
             var now = new Date()
@@ -168,8 +168,11 @@ export default function Page() {
         }
         else {
             loadRNCache()
-            // const test = require('@/utils/push').default
-            // test()
+            if (Taro.getSystemInfoSync().platform != 'ios') {
+                const test = require('@/utils/push').default
+                test()
+            }
+
         }
 
         if (process.env.TARO_ENV == 'rn') {
@@ -202,7 +205,7 @@ export default function Page() {
                 })
             }*/
 
-            
+
         }
 
     }, [])
@@ -219,7 +222,7 @@ export default function Page() {
             //检查用户是否添加过小程序
             checkAddToMini();
 
-            
+
 
             if (process.env.TARO_ENV == 'rn') {
                 if (Taro.getSystemInfoSync().platform == 'ios') {
@@ -372,7 +375,7 @@ export default function Page() {
         updateNotificationStatus()
     };
 
-    function updateNotificationStatus(){
+    function updateNotificationStatus() {
         if (process.env.TARO_ENV == 'rn') {
             if (user.isLogin) {
                 if (Taro.getSystemInfoSync().platform == 'ios') {
@@ -455,8 +458,10 @@ export default function Page() {
         }
         var timeZoneFormatted = getTimezone()
         var timeZoneId = ''
+        var timeZoneName = ''
         if (Taro.getSystemInfoSync().platform == 'ios') {
             timeZoneId = dayjs.tz.guess()
+            timeZoneName = getTimezoneName()
         }
         clientInfo({
             client: {
@@ -466,9 +471,10 @@ export default function Page() {
             },
             meta: {
                 language: language,
-                time_zone: {
-                    name: timeZoneFormatted,
-                    id: timeZoneId
+                timezone: {
+                    gmt: timeZoneFormatted,
+                    id: timeZoneId,
+                    name:timeZoneName
                 },
             },
             device: {
@@ -932,7 +938,7 @@ export default function Page() {
                 {
                     user.isLogin && !showErrorPage && <View style={{ marginTop: rpxToPx(60), display: 'flex', flexDirection: 'column' }}>
                         <Text className="discovery1" >{t('feature.track_time_duration.weekly.title')}</Text>
-                        <WeekCalendar />
+                        {/* <WeekCalendar /> */}
                     </View>
                 }
                 {

src/services/http/request.ts

@@ -59,6 +59,9 @@ export async function request<T>(param: RequestParam): Promise<T> {
 
 
     function performRequest(resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) {
+        // if (process.env.TARO_ENV == 'rn' && Taro.getSystemInfoSync().platform != 'ios') {
+        //     return;
+        // }
         const { url, method, data } = param;
         console.log(url)
         var requestTask: any = null;
@@ -76,6 +79,12 @@ export async function request<T>(param: RequestParam): Promise<T> {
             header['X-Time-Zone-Id'] = dayjs.tz.guess() ? dayjs.tz.guess() : '';
         }
 
+        header['X-Timezone'] = {
+            id:Taro.getSystemInfoSync().platform == 'ios'?dayjs.tz.guess():'',
+            name:timeZoneName?timeZoneName:'',
+            gmt:timeZoneFormatted
+        }
+
 
 
         header['X-Platform'] = Taro.getSystemInfoSync().platform == 'ios' ? 'IOS' : 'ANDROID'; //IOS ANDROID

src/utils/tools.ts

@@ -58,6 +58,8 @@ export function vibrate(type?: string) {
     }
 }
 
+
+//微信sdk版本比较
 export function compareVersion(v1, v2) {
     v1 = v1.split('.')
     v2 = v2.split('.')
@@ -80,7 +82,6 @@ export function compareVersion(v1, v2) {
             return -1
         }
     }
-
     return 0
 }