Leon 2 yıl önce
ebeveyn
işleme
d79402ea23

+ 2 - 20
src/components/input/Slider.tsx

@@ -4,24 +4,11 @@ import { ColorType } from '@/context/themes/color'
 import { useState } from 'react';
 import { rpxToPx } from '@/utils/tools';
 
-export default function (props: { onChanged?: Function }) {
-    const colors = [
-        '#00ffff', '#1cf2ff', '#39e6ff', '#56d9ff', '#73cdff', '#90c1ff', '#adb4ff', '#caa8ff', '#e79bff', '#ffaeff', '#ffffff',
-        '#ffebe5',
-        '#ffd7cc',
-        '#ffc2b2',
-        '#ffae99',
-        '#ff9a7f',
-        '#ff8656',
-        '#ff723c',
-        '#ff5e23',
-        '#ff4909',
-        '#ff7a4e'
-    ]
+export default function (props: { onChanged?: Function,value?:number }) {
 
     const [brightness, setBrightness] = useState(0);
     const [isSliding, setIsSliding] = useState(false);
-    const [value, setValue] = useState(0)
+    const [value, setValue] = useState(props.value?props.value:0)
     const [startX, setStartX] = useState(0);
 
     const handleTouchStart = (event) => {
@@ -57,11 +44,6 @@ export default function (props: { onChanged?: Function }) {
         
     };
 
-    function getColor() {
-        var index = Math.round((brightness / 100) * 20)
-        return colors[index];
-    }
-
     function calculateOpacity(number) {
         if (number === 0 || number === 100) {
             return 1;

+ 6 - 3
src/features/food/FoodConsole.tsx

@@ -29,16 +29,20 @@ export default function Component(props: { addItem: Function, firstItem: any })
     }
 
     useEffect(() => {
+        console.log('apple',props.firstItem)
         setFirstData(props.firstItem)
-    }, [props.firstItem])
+    }, [props.firstItem,props.firstItem.feel.post_meal])
 
     useEffect(() => {
-        if (firstData && firstData.status == 'ONGOING' &&
+        if (firstData &&
             firstData.mindful_mode == 'AWARE' &&
             (!firstData.feel.post_meal || !firstData.feel.pre_meal)) {
             setLastUnFinished(true)
             setModeOn(true)
         }
+        else {
+            setLastUnFinished(false)
+        }
     }, [firstData])
 
     useEffect(() => {
@@ -152,7 +156,6 @@ export default function Component(props: { addItem: Function, firstItem: any })
                     name: 'file',
                     formData: rsp.data.fields,
                     success: rlt => {
-                        console.log(rlt)
                         createData(rsp.data.view_url, source)
 
                         // uploadAvatar(rsp.data.view_url)

+ 2 - 0
src/features/food/FoodJournal.tsx

@@ -72,6 +72,7 @@ export default function Component() {
 
     //0点刷新一下数据
     function refreshData() {
+        console.log('aaaa')
         list.map(item => {
             item.showDate = false
         })
@@ -87,6 +88,7 @@ export default function Component() {
 
         setList(list)
         setCount(count + 1)
+        debugger
     }
 
     function getConfigs() {

+ 1 - 1
src/features/food/FoodTimeline.tsx

@@ -60,7 +60,7 @@ export default function Component(props: { array: any, refresh: Function, forceR
                     preview={() => preview(index)}
                     update={(data) => updateItem(index, data)}
                     forceRefresh={() => props.forceRefresh()}
-                    refresh={() => props.refresh()}
+                    refresh={() => {props.refresh();console.log('oppppp');debugger}}
                 />
             })
         }

+ 8 - 4
src/features/food/FoodTimelineItem.tsx

@@ -223,8 +223,12 @@ export default function Component(props: {
 
             setDetail(res)
             setCount(count + 1)
-
-            props.update(res)
+            if (isPreMeal) {
+                props.refresh()
+            }
+            else {
+                props.forceRefresh()
+            }
         }).catch(e => {
 
         })
@@ -350,7 +354,7 @@ export default function Component(props: {
     return <View>
         {
             detail.mindful_mode == 'AWARE' && detail.feel.pre_meal && !detail.feel.post_meal && <View style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', marginBottom: rpxToPx(60) }}>
-                <Slider onChanged={(value) => { updateFeel(value,false) }} />
+                <Slider onChanged={(value) => { updateFeel(value, false) }} />
             </View>
         }
         <View className="food_timeline_item" onLongPress={showActionSheet}>
@@ -393,7 +397,7 @@ export default function Component(props: {
         </View>
         {
             detail.mindful_mode == 'AWARE' && !detail.feel.pre_meal && <View style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', marginBottom: rpxToPx(60) }}>
-                <Slider onChanged={(value) => {updateFeel(value,true) }} />
+                <Slider onChanged={(value) => { updateFeel(value, true) }} />
             </View>
         }
         {