leon 1 ano atrás
pai
commit
8c356b999b

+ 1 - 1
android/app/build.gradle

@@ -144,7 +144,7 @@ aaptOptions.useNewCruncher = false
         applicationId app_id
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 21
+        versionCode 22
         versionName "1.0.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 //        manifestPlaceholders = [

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
android/app/src/main/assets/index.android.bundle


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
android/app/src/main/assets/index.android.map


+ 2 - 2
ios/hola.xcodeproj/project.pbxproj

@@ -572,7 +572,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 106;
+				CURRENT_PROJECT_VERSION = 109;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hola/Info.plist;
@@ -605,7 +605,7 @@
 				CODE_SIGN_ENTITLEMENTS = hola/hola.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 106;
+				CURRENT_PROJECT_VERSION = 109;
 				DEVELOPMENT_TEAM = GPMXAZ9G5N;
 				INFOPLIST_FILE = hola/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

+ 1 - 1
ios/hola/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>106</string>
+	<string>109</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
ios/main.jsbundle


+ 1 - 1
src/context/locales/zh.js

@@ -702,7 +702,7 @@ export default {
             weekly: {
                 show_eating_window:'进食与活动时间',
                 current_week: '本周',
-                title: '每周趋势',
+                title: '时间段',
                 fast_average: '平均断食',
                 sleep_average: '平均睡眠',
                 eat_average:'平均进食',

+ 7 - 6
src/features/daynight/DayNightDetailPopup.tsx

@@ -20,7 +20,7 @@ const timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
 
-let LinearGradient,useActionSheet
+let LinearGradient, useActionSheet
 if (process.env.TARO_ENV == 'rn') {
     LinearGradient = require('react-native-linear-gradient').default
     useActionSheet = require('@expo/react-native-action-sheet').useActionSheet
@@ -35,12 +35,13 @@ export default function DayNightDetailPopup(props: {
 }) {
     const dayNight = useSelector((state: any) => state.night);
     const day = useSelector((state: any) => state.day);
+    const user = useSelector((state: any) => state.user);
     const [tabIndex, setTabIndex] = useState(0)
     const [isLoading, setIsLoading] = useState(false)
     const { t } = useTranslation()
 
     let showActionSheetWithOptions;
-    if (process.env.TARO_ENV=='rn'){
+    if (process.env.TARO_ENV == 'rn') {
         showActionSheetWithOptions = useActionSheet()
     }
 
@@ -601,7 +602,7 @@ export default function DayNightDetailPopup(props: {
         })
     }
 
-    function testTapLocationIndex(index){
+    function testTapLocationIndex(index) {
         switch (index) {
             case 0:
                 {
@@ -639,7 +640,7 @@ export default function DayNightDetailPopup(props: {
     }
 
     function testChangeLocation() {
-        if (process.env.TARO_ENV=='rn' && kIsIOS){
+        if (process.env.TARO_ENV == 'rn' && kIsIOS) {
             showActionSheet({
                 showActionSheetWithOptions: showActionSheetWithOptions,
                 itemList: [
@@ -654,7 +655,7 @@ export default function DayNightDetailPopup(props: {
             });
             return
         }
-        
+
         Taro.showActionSheet({
             itemList: [
                 '纽约40.697,-74.309',
@@ -686,7 +687,7 @@ export default function DayNightDetailPopup(props: {
 
         </View>
         {
-            <Text style={{ color: '#fff', fontSize: 20, fontWeight: 'bold' }} onClick={testChangeLocation}>位置更改测试</Text>
+            user.test_user && <Text style={{ color: '#fff', fontSize: 20, fontWeight: 'bold' }} onClick={testChangeLocation}>位置更改测试</Text>
         }
 
         <View className='detail_tabbar'>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff