update

src/pages/common/RecordsHistory.scss

@@ -24,7 +24,13 @@
     flex-direction: row;
     align-items: center;
     margin-left: 46px;
-    margin-bottom: 30px;
+    margin-bottom: 20px;
+    margin-top: -10px;
+}
+
+.filter_bar_item{
+    padding-bottom: 10px;
+    padding-top: 10px;
 }
 
 .filter_item_normal {

src/pages/common/RecordsHistory.tsx

@@ -18,6 +18,7 @@ import './RecordsHistory.scss'
 import { clearWorkoutRecords, workoutRecords } from "@/services/workout";
 import WorkoutHistory from "@/features/workout/WorkoutHistory";
 import showAlert from "@/components/basic/Alert";
+import { rpxToPx } from "@/utils/tools";
 
 let useRoute;
 let useNavigation;
@@ -337,17 +338,17 @@ export default function Page() {
 
     function filters() {
         return <View className="filter_bar">
-            <View onClick={() => { tapFilter(0) }}>
-                <Text className={filterIndex == 0 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_all')}</Text>
+            <View className="filter_bar_item" onClick={() => { tapFilter(0) }}>
+                <Text onClick={() => { tapFilter(0) }} className={filterIndex == 0 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_all')}</Text>
             </View>
-            <View onClick={() => { tapFilter(1) }}>
-                <Text className={filterIndex == 1 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_fast_sleep')}</Text>
+            <View className="filter_bar_item" onClick={() => { tapFilter(1) }}>
+                <Text onClick={() => { tapFilter(1) }} className={filterIndex == 1 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_fast_sleep')}</Text>
             </View>
-            <View onClick={() => { tapFilter(2) }}>
-                <Text className={filterIndex == 2 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_fast')}</Text>
+            <View className="filter_bar_item" onClick={() => { tapFilter(2) }}>
+                <Text  onClick={() => { tapFilter(2) }} className={filterIndex == 2 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_fast')}</Text>
             </View>
-            <View onClick={() => { tapFilter(3) }}>
-                <Text className={filterIndex == 3 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_sleep')}</Text>
+            <View className="filter_bar_item" onClick={() => { tapFilter(3) }}>
+                <Text onClick={() => { tapFilter(3) }} className={filterIndex == 3 ? 'filter_item_sel' : 'filter_item_normal'}>{t('feature.track_time_duration.record_fast_sleep.tab_sleep')}</Text>
             </View>
         </View>
     }

src/utils/push.tsx

@@ -4,6 +4,7 @@ import { clientId } from '@/services/user';
 import JPush from 'jpush-react-native';
 import { title } from 'process';
 import { uploadPermissions } from './native_permission_check';
+import {OneSignal} from 'react-native-onesignal'
 
 export default function jgPush() {
     // const JPush = require('jpush-react-native')
@@ -56,7 +57,7 @@ export default function jgPush() {
     })
 
     const LogLevel = require('react-native-onesignal').LogLevel
-    const OneSignal = require('react-native-onesignal').OneSignal
+    // const OneSignal = require('react-native-onesignal').OneSignal
 
     OneSignal.Debug.setLogLevel(LogLevel.Verbose);
 
@@ -74,6 +75,10 @@ export default function jgPush() {
 
     OneSignal.User.getOnesignalId().then((id) => {
         console.log('OneSignal: device id:', id);
+        global.oneID = id
+        setTimeout(() => {
+            clientId(false)
+        }, 3000)
         // showAlert({
         //     title: 'OneSignal',
         //     content: 'device id: ' + id