update

android/app/src/main/java/com/hola/AlarmReceiver.java

@@ -1,6 +1,7 @@
 package com.hola;
 
 import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -15,16 +16,19 @@ import java.time.Duration;
 public class AlarmReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        Log.e("hello1111111111111","world");
         String title = intent.getStringExtra("title");
         String message = intent.getStringExtra("message");
         String channel = intent.getStringExtra("channel");
+
+        Intent intent2 = new Intent(context, MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, 0, intent2, PendingIntent.FLAG_IMMUTABLE);
         // 创建通知构建器
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context, channel)
-                .setSmallIcon(android.R.drawable.ic_dialog_info)
+                .setSmallIcon(R.drawable.ic_stat_onesignal_default)
                 .setContentTitle(title)
                 .setContentText(message)
-                .setPriority(NotificationCompat.PRIORITY_DEFAULT);
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+                .setContentIntent(pendingIntent);
 
         // 显示通知
         NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);

android/app/src/main/java/com/hola/HolaModule.java

@@ -66,9 +66,9 @@ public class HolaModule extends ReactContextBaseJavaModule {
 
         // 4. 使用 AlarmManager 调度通知
         AlarmManager alarmManager = (AlarmManager) getCurrentActivity().getSystemService(Context.ALARM_SERVICE);
-        alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime()+10*1000,pendingIntent);
-//        alarmManager.setInexactRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(),
-//                AlarmManager.INTERVAL_DAY, pendingIntent);
+//        alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime()+10*1000,pendingIntent);
+        alarmManager.setInexactRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(),
+                AlarmManager.INTERVAL_DAY, pendingIntent);
     }
 
     private void createNotificationChannel(Context context) {

src/features/daynight/DayNightSwiperPopup.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next'
 import Taro from '@tarojs/taro'
 import { systemLocation } from '@/services/common'
 import showAlert from '@/components/basic/Alert'
-import { getTimezone, rpxToPx } from '@/utils/tools'
+import { getTimezone, kIsIOS, rpxToPx } from '@/utils/tools'
 import { clearLocation } from '@/services/user'
 import { TimeFormatter } from '@/utils/time_format'
 
@@ -226,7 +226,13 @@ export default function DayNightSwiperPopup(props: { authInfo: any }) {
                             cancelText: t('feature.auth_sys.location_cancel'),
                             confirmText: t('feature.auth_sys.location_confirm'),
                             confirm: () => {
-                                Linking.openURL('app-settings:')
+                                if (kIsIOS){
+                                    Linking.openURL('app-settings:')
+                                }
+                                else {
+                                    Linking.openSettings()
+                                }
+                                
                             }
                         })
                     }

src/features/trackTimeDuration/actions/TrackTimeActions.tsx

@@ -112,8 +112,6 @@ export const uploadLocalPushInfo = (params) => {
 export const getLocalPush = () => {
     if (process.env.TARO_ENV == 'rn') {
         PushNotification.checkPermissions((res)=>{
-            console.log('aaaaaaaa',res)
-            console.log('aaaaaaaa',res.alert)
             //允许授权
             if ((kIsIOS && res.authorizationStatus == 2) || (!kIsIOS && res.alert)){
                 request({
@@ -187,7 +185,6 @@ export const getLocalPush = () => {
                                     const { time, repeat_type } = item.recurring;
                                     const date = dayjs().format('YYYY-MM-DD')
                                     const { HolaModule } = NativeModules
-                                    debugger
                                     HolaModule.addLocalPush(item.title, item.body+ '\nPress for actions >>', time)
                                     return;
         

src/pages/clock/ClockMain.tsx

@@ -138,7 +138,7 @@ export default function Page() {
         mainTimer()
     }, [])
 
-    function mainTimer(){
+    function mainTimer() {
         if (timer) {
             clearInterval(timer)
             timer = null
@@ -657,7 +657,7 @@ export default function Page() {
         else {
             PushNotification.checkPermissions((res) => {
                 //允许授权
-                if ((kIsIOS && res.authorizationStatus == 2) || (!kIsIOS && res.alert)){
+                if ((kIsIOS && res.authorizationStatus == 2) || (!kIsIOS && res.alert)) {
                 }
                 else {
                     showAlert({
@@ -702,7 +702,7 @@ export default function Page() {
         else {
             PushNotification.checkPermissions((res) => {
                 //允许授权
-                if ((kIsIOS && res.authorizationStatus == 2) || (!kIsIOS && res.alert)){
+                if ((kIsIOS && res.authorizationStatus == 2) || (!kIsIOS && res.alert)) {
                 }
                 else {
                     showAlert({
@@ -821,7 +821,7 @@ export default function Page() {
                 </Box>
 
                 {
-                    user.isLogin && records.length > 0 && <View className="index_section" style={{ marginTop: -rpxToPx(25-12), marginBottom: -rpxToPx(20) }}>
+                    user.isLogin && records && records.length > 0 && <View className="index_section" style={{ marginTop: -rpxToPx(25 - 12), marginBottom: -rpxToPx(20) }}>
                         <Text className="index_section_title">{t('feature.track_time_duration.record_fast_sleep.header.latest_record')}</Text>
                         {
                             process.env.TARO_ENV == 'weapp' && <Text className="fast_sleep_more index_more" onClick={more}>{t('feature.track_time_duration.record_fast_sleep.header.btn_show_all')}</Text>
@@ -834,11 +834,11 @@ export default function Page() {
                     </View>
                 }
                 {
-                    user.isLogin && records.length==0 && <View  style={{ marginTop: -rpxToPx(25) }}/>
+                    user.isLogin && records && records.length == 0 && <View style={{ marginTop: -rpxToPx(25) }} />
                 }
 
                 {
-                    user.isLogin && records.length > 0 && <View id="latest" className="fast_sleep_item_bg">
+                    user.isLogin && records && records.length > 0 && <View id="latest" className="fast_sleep_item_bg">
                         <RecordFastSleep data={records[0]} type='record' index={-20000} />
                     </View>
                 }
@@ -864,17 +864,17 @@ export default function Page() {
                     </View>
                 }
 
-                
+
 
 
                 {
-                    user.isLogin && !showErrorPage && <View className="index_section" style={{height:rpxToPx(120),marginTop:rpxToPx(40)}}>
+                    user.isLogin && !showErrorPage && <View className="index_section" style={{ height: rpxToPx(120), marginTop: rpxToPx(40) }}>
                         <Text className="index_main_title">{t('feature.pro.for_pro')}</Text>
                     </View>
                 }
 
                 {
-                    user.isLogin && !showErrorPage && <View className="index_section" style={{marginBottom:-rpxToPx(10),marginTop:-rpxToPx(40)}}>
+                    user.isLogin && !showErrorPage && <View className="index_section" style={{ marginBottom: -rpxToPx(10), marginTop: -rpxToPx(40) }}>
                         <Text className="index_section_title">{t('feature.day_night.group_title')}</Text>
                     </View>
                 }
@@ -892,7 +892,7 @@ export default function Page() {
                     user.isLogin && (process.env.TARO_ENV == 'weapp') && <Discovery />
                 }
 
-                
+
                 {
                     modalContent()
                 }

src/services/http/request.ts

@@ -90,12 +90,12 @@ export async function request<T>(param: RequestParam): Promise<T> {
         header['X-Timestamp'] = new Date().getTime()
         if (token.length > 0) {
             header['Authorization'] = `Bearer ${token}`;
-
-            // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiZTQ3M2RlZDI4YzgwNzY3ZDZiOTBkYzAzMDg5YzRhYzEiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiLmtYvor5UiLCJ0eXAiOiJCZWFyZXIiLCJzZXNzaW9uX3N0YXRlIjoiYzdhYmE2MzJjNThmZTJlODllYTRhM2Y2OTZhMzdhN2YiLCJleHAiOjIwMzM3OTQyODIsImlhdCI6MTcxODI2MTQ4Mn0.P5tVYnyDWqiPM8TgXDicqQob0v1wO14D7QyfvJUs8ns';
+            // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiMTE0Nzg0NGE5NDIyODk1MmE5Zjc2OTdjYWJjYmU3Y2UiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJGYXN0ZXIiLCJ0eXAiOiJCZWFyZXIiLCJzZXNzaW9uX3N0YXRlIjoiZWE5NTQ1Y2VkNThlNzgzNTA1MWRjZTY0ODEwMzQ4ZmQiLCJleHAiOjE3NDk3MDA3MTYsImlhdCI6MTcxODE2NDcxN30.yrh-xAJhmfG-CueyCsToW-X4Dx043DYhk5DiE0E4eNk';
             // header['Authorization'] = 'Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJhdWQiOiJhY2NvdW50Iiwic3ViIjoiMjZkOGE1YTg0MDMyYmExN2Q4NDk3MTlkNTljNGY1NzgiLCJpc3MiOiJmYXN0Iiwibmlja25hbWUiOiJCSyIsInR5cCI6IkJlYXJlciIsInNlc3Npb25fc3RhdGUiOiI1ZDU2NTkzYmNjNWFmNzM0OWNlZTMwZjlkNGYzMWIyMCIsImV4cCI6MTc0ODE3MDg5NSwiaWF0IjoxNzE2NjM0ODk1fQ.uaRm2vSNCX8fkFS63Oe-WNWIDHG_cRM-nQ5EGyUMaBg';
         }
 
 
+
         const timer = setTimeout(() => {
             requestTask && requestTask.abort();
             console.log('timeout');
@@ -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
                             })