update

src/components/layout/Box.rn.tsx

@@ -21,7 +21,6 @@ export default function Component(props: {
 
     const handleLayout = (event: LayoutChangeEvent) => {
         const { height } = event.nativeEvent.layout;
-        console.log(height)
         setHeight(height);
     };
 

src/components/layout/layout.tsx

@@ -42,11 +42,11 @@ export default function Layout(props: {
                 headerTitle: showTitle ? props.title ? props.title : '' : '',
             });
         }
+        console.log(showTitle)
 
     }, [showTitle])
 
     function onScroll(e) {
-        console.log('a')
         if (props.titleShowStyle == NaviBarTitleShowType.scrollToShow) {
             if (e.detail.scrollTop > 70) {
                 setShowTitle(true)
@@ -162,6 +162,17 @@ export default function Layout(props: {
                 }
             </View>
         case TemplateType.customHeader:
+            if (process.env.TARO_ENV == 'rn') {
+                return <ScrollView onScroll={onScroll}>
+                    <View className='flex'>
+                        {
+                            props.header
+                        }
+                        {children}
+                        <View style={{ height: 50 }} />
+                    </View>
+                </ScrollView>
+            }
             return <View className='flex'>
                 {/* <View className="flex-expand" /> */}
                 {

src/components/view/Timeline_backup.tsx

@@ -11,7 +11,7 @@ export default function Component(props: { items: any[], title?: string, type?:
         }
         {
             props.items.map((item, index) => (
-                <View className='timelineItem'>
+                <View className='timelineItem' key={index}>
                     <View className='timelineContentView'>
                         {
                             item.status == 'padding' && <CheckBox type={CheckBoxType.empty} opacity={0.4} />

src/features/trackTimeDuration/components/Console.tsx

@@ -486,7 +486,7 @@ export default function Component(props: { isNextStep?: boolean }) {
     }
 
     if (props.isNextStep) {
-        return <Box >
+        return <Box style={{marginBottom:0}}>
             <View style={{
                 display: 'flex', flexDirection: 'column', alignItems: 'center', flexShrink: 0,
                 opacity: time.status == 'WAIT_FOR_START' ? 0.4 : 1,

src/features/workout/Workout.tsx

@@ -240,7 +240,16 @@ export default function Component(props: any) {
                 var count = Taro.getStorageSync('lastWorkoutDuration') ?? 60 * 50
                 //进行中的处理
                 if (item.code == workout.code && workout.status == 'ing') {
-                    Taro.navigateTo({ url: '/pages/workout/Working?type=stop_watch&restore=true&count=' + count })
+                    jumpPage('/pages/workout/Working?type=stop_watch&restore=true&count=' + count,
+                        'Working',
+                        navigation,
+                        {
+                            type: 'stop_watch',
+                            restore: true,
+                            count: count
+                        }
+                    )
+                    // Taro.navigateTo({ url: '/pages/workout/Working?type=stop_watch&restore=true&count=' + count })
                 }
                 else {
                     if (workout.status == 'ing') {
@@ -277,7 +286,16 @@ export default function Component(props: any) {
                                     setSelItem(lastObject)
                                     dispatch(setCurrentWorkoutItem(lastObject))
                                     var count = Taro.getStorageSync('lastWorkoutDuration') ?? 60 * 50
-                                    Taro.navigateTo({ url: '/pages/workout/Working?type=stop_watch&restore=true&count=' + count })
+                                    jumpPage('/pages/workout/Working?type=stop_watch&restore=true&count=' + count,
+                                        'Working',
+                                        navigation,
+                                        {
+                                            type: 'stop_watch',
+                                            restore: true,
+                                            count: count
+                                        }
+                                    )
+                                    // Taro.navigateTo({ url: '/pages/workout/Working?type=stop_watch&restore=true&count=' + count })
                                 } else if (res.cancel) {
                                     console.log('用户点击取消')
                                 }
@@ -305,10 +323,6 @@ export default function Component(props: any) {
         }
     }
 
-    function timeStart() {
-        Taro.navigateTo({ url: '/pages/workout/Working?type=timer' })
-    }
-
     function successAuth() {
         Taro.setStorage({ key: 'auth', data: true })
         setAllowRun(true)
@@ -889,7 +903,15 @@ export default function Component(props: any) {
                             setTargetTime(count);
                             setShowModal(false);
                             Taro.setStorageSync('lastWorkoutDuration', count)
-                            Taro.navigateTo({ url: '/pages/workout/Working?type=stop_watch&count=' + count })
+                            jumpPage('/pages/workout/Working?type=stop_watch&count=' + count,
+                                'Working',
+                                navigation,
+                                {
+                                    type: 'stop_watch',
+                                    count: count
+                                }
+                            )
+                            // Taro.navigateTo({ url: '/pages/workout/Working?type=stop_watch&count=' + count })
                         }} />
                 }
                 {

src/pages/account/ProfileSetting.tsx

@@ -50,6 +50,20 @@ export default function Page() {
 
     }
 
+    function choose(){
+        if (process.env.TARO_ENV=='rn'){
+            Taro.chooseImage({
+                count: 1, // 默认9
+                sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+                sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有，在H5浏览器端支持使用 `user` 和 `environment`分别指定为前后摄像头
+                success: function (res) {
+                  // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+                  var tempFilePaths = res.tempFilePaths
+                }
+            })
+        }
+    }
+
     function chooseAvatar(e) {
         const { avatarUrl } = e.detail
         var dot = avatarUrl.lastIndexOf('.')
@@ -108,11 +122,16 @@ export default function Page() {
                 <View className="camera_bg">
                     <Image className="camera" src={require('@assets/images/camera.png')} />
                 </View>
-                <Button className="btn" openType="chooseAvatar" onChooseAvatar={chooseAvatar}></Button>
+                <Button className="btn" openType="chooseAvatar" onChooseAvatar={chooseAvatar} ></Button>
+            
             </View>
         </View>
 
 
+
+        <Text style={{color:'red'}} onClick={choose}>rn 选择头像测试</Text>
+
+
         <View onClick={editNickname}>
             <TableCell onClick={editNickname} title={t('page.user_profile.nickname')} showArrow={true} showMarginBottom={true}>
                 <Text style={{ opacity: 0.8 }}>{router.params.newuser == '1' ? (user.nickname == name ? '取个名字' : user.nickname) : user.nickname}</Text>

src/pages/clock/Clock.weapp.tsx

@@ -93,6 +93,7 @@ export default function IndexPage() {
   }
 
   useEffect(() => {
+    
     console.log('clock page init')
     global.consoleType = 'idle'
     dispatch(staticResources() as any);
@@ -550,11 +551,11 @@ export default function IndexPage() {
     )
   }
 
-  if (process.env.TARO_ENV == 'rn') {
-    return <ScrollView>
-      {detail()}
-    </ScrollView>
-  }
+  // if (process.env.TARO_ENV == 'rn') {
+  //   return <ScrollView>
+  //     {detail()}
+  //   </ScrollView>
+  // }
 
 
 

src/pages/rn/RNMain.tsx

@@ -16,6 +16,8 @@ import RecordsHistory from '@/pages/common/RecordsHistory'
 import ProfileSetting from '@/pages/account/ProfileSetting'
 import EditPage from '@/pages/account/EditPage'
 import Food from '@/pages/food/Food'
+import Working from '@/pages/workout/Working'
+import WorkoutDetail from '@/pages/workout/WorkoutDetail'
 // import DemoA from '../clock/demoA';
 import { View } from '@tarojs/components';
 
@@ -119,6 +121,8 @@ export default function RNMain() {
         <Stack.Screen name='SetSchedule' component={SetSchedule} />
         <Stack.Screen name='ProfileSetting' component={ProfileSetting} />
         <Stack.Screen name='EditPage' component={EditPage} />
+        <Stack.Screen name='Working' component={Working} />
+        <Stack.Screen name='WorkoutDetail' component={WorkoutDetail} />
       </Stack.Navigator>
     </NavigationContainer>
   )

src/pages/workout/Working.tsx

@@ -7,9 +7,21 @@ import { View } from "@tarojs/components";
 import { useRouter } from "@tarojs/taro";
 import { useSelector } from "react-redux";
 
+let useRoute;
+if (process.env.TARO_ENV == 'rn') {
+    useRoute = require("@react-navigation/native").useRoute
+}
+
 export default function Page() {
     const workout = useSelector((state: any) => state.workout);
-    const router = useRouter();
+    let router
+    if (process.env.TARO_ENV == 'rn') {
+        router = useRoute()
+    }
+    else {
+        router = useRouter()
+    }
+    // const router = useRouter();
 
     function detail() {
         return <View>