Leon hace 1 año
padre
commit
b4f9b77e70

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
android/app/src/main/assets/index.android.bundle


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
android/app/src/main/assets/index.android.map


+ 3 - 3
src/features/daynight/DayNightStatus.scss

@@ -1,11 +1,11 @@
 .day_night_status {
     height: 36px;
-    line-height: 36px;
+    // line-height: 36px;
     border-radius: 18px;
     font-size: 20px;
     display: flex;
-    // align-items: center;
-    // justify-content: center;
+    align-items: center;
+    justify-content: center;
     padding-left: 16px;
     padding-right: 16px;
     margin-left: 6px;

+ 3 - 3
src/features/trackTimeDuration/components/CircadianStatus.scss

@@ -2,12 +2,12 @@
 
 .day_night_status {
     height: 36px;
-    line-height: 36px;
+    // line-height: 36px;
     border-radius: 18px;
     font-size: 20px;
     display: flex;
-    // align-items: center;
-    // justify-content: center;
+    align-items: center;
+    justify-content: center;
     padding-left: 16px;
     padding-right: 16px;
     margin-left: 6px;

+ 7 - 6
src/features/trackTimeDuration/components/IndexConsole.tsx

@@ -18,6 +18,7 @@ import { setWXFollow } from '@/store/permission';
 import CircadianDetailPopup from './CircadianDetailPopup';
 import showAlert from '@/components/basic/Alert';
 import CheckAccess from './CheckAccess';
+import { ColorType } from '@/context/themes/color';
 
 let useNavigation;
 
@@ -785,7 +786,7 @@ export default function IndexConsole(props: { record: any, count: number }) {
                 {
                     status == 'WAIT_FOR_START' &&
                     <View onClick={tapStartFast} className='console_btn'>
-                        <Text style={{ fontWeight: 'bold' }}>{t('feature.track_time_duration.common.start_fast')}</Text>
+                        <Text style={{ fontWeight: 'bold',color:ColorType.black }}>{t('feature.track_time_duration.common.start_fast')}</Text>
                     </View>
                 }
                 {/* {
@@ -793,7 +794,7 @@ export default function IndexConsole(props: { record: any, count: number }) {
                 } */}
                 {
                     status == 'ONGOING' && <View onClick={tapEndFast} className={status == 'ONGOING' ? 'console_btn' : 'console_btn btn_disable'}>
-                        <Text style={{ fontWeight: 'bold' }}>{t('feature.track_time_duration.common.end_fast')}</Text>
+                        <Text style={{ fontWeight: 'bold',color:ColorType.black }}>{t('feature.track_time_duration.common.end_fast')}</Text>
                     </View>
                 }
                 {
@@ -832,7 +833,7 @@ export default function IndexConsole(props: { record: any, count: number }) {
             {
                 status == 'WAIT_FOR_START' ?
                     <View onClick={tapStartFast} className='console_btn'>
-                        <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32) }}>{t('feature.track_time_duration.common.start_fast')}</Text>
+                        <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32),color:ColorType.black }}>{t('feature.track_time_duration.common.start_fast')}</Text>
                     </View> :
                     <View onClick={() => { tapStage(0) }} className='stage_btn'>
                         <Text style={{ flex: 1, color: '#fff' }}>{t('feature.track_time_duration.stage.a')}</Text>
@@ -851,7 +852,7 @@ export default function IndexConsole(props: { record: any, count: number }) {
                     {
                         status != 'ONGOING1' && <Image className='lock' src={require('@assets/images/lock.png')} />
                     }
-                    <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32) }}>{t('feature.track_time_duration.common.start_sleep')}</Text>
+                    <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32),color:ColorType.black }}>{t('feature.track_time_duration.common.start_sleep')}</Text>
                 </View>
             }
             {
@@ -873,7 +874,7 @@ export default function IndexConsole(props: { record: any, count: number }) {
                     {
                         status != 'ONGOING2' && <Image className='lock' src={require('@assets/images/lock.png')} />
                     }
-                    <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32) }}>{t('feature.track_time_duration.common.end_sleep')}</Text>
+                    <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32),color:ColorType.black }}>{t('feature.track_time_duration.common.end_sleep')}</Text>
                 </View>
             }
             {
@@ -890,7 +891,7 @@ export default function IndexConsole(props: { record: any, count: number }) {
                     {
                         status == 'WAIT_FOR_START' && <Image className='lock' src={require('@assets/images/lock.png')} />
                     }
-                    <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32) }}>{t('feature.track_time_duration.common.end_fast')}</Text>
+                    <Text style={{ fontWeight: 'bold', fontSize: rpxToPx(32),color:ColorType.black  }}>{t('feature.track_time_duration.common.end_fast')}</Text>
                 </View>
             }
             {

+ 3 - 0
src/pages/clock/ClockMain.tsx

@@ -360,6 +360,9 @@ export default function Page() {
                     var Jto = require('react-native').NativeModules.NativeBridge;
                     Jto.getNotificationAuthStatus()
                 }
+                else {
+                    uploadPermissions()
+                }
             }
             // JPush.setBadge({
             //     badge: 0,

+ 1 - 1
src/services/http/api.js

@@ -1,4 +1,4 @@
-const online = process.env.TARO_ENV == 'rn' ? true : false;
+const online = process.env.TARO_ENV == 'rn' ? false : false;
 
 import { WX_VERSION as _WX_VERSION, APP_VERSION as _APP_VERSION } from "../../../config/env";
 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio