podfile lock rm

.gitignore

@@ -62,6 +62,7 @@ buck-out/
 # *.jsbundle
 
 # Ruby / CocoaPods
+Podfile.lock
 /ios/Pods/
 /vendor/bundle/
 

ios/Podfile.lock

@@ -1,802 +0,0 @@
-PODS:
-  - boost (1.76.0)
-  - CocoaAsyncSocket (7.6.5)
-  - DoubleConversion (1.1.6)
-  - EXApplication (5.0.1):
-    - ExpoModulesCore
-  - EXAV (13.0.3):
-    - ExpoModulesCore
-    - ReactCommon/turbomodule/core
-  - EXBarCodeScanner (12.0.0):
-    - EXImageLoader
-    - ExpoModulesCore
-    - ZXingObjC/OneD
-    - ZXingObjC/PDF417
-  - EXBrightness (11.0.1):
-    - ExpoModulesCore
-  - EXCamera (13.0.0):
-    - ExpoModulesCore
-  - EXConstants (14.0.2):
-    - ExpoModulesCore
-  - EXErrorRecovery (4.0.1):
-    - ExpoModulesCore
-  - EXFileSystem (15.1.1):
-    - ExpoModulesCore
-  - EXFont (11.0.1):
-    - ExpoModulesCore
-  - EXImageLoader (4.0.0):
-    - ExpoModulesCore
-    - React-Core
-  - EXLocation (15.0.1):
-    - ExpoModulesCore
-  - Expo (47.0.14):
-    - ExpoModulesCore
-  - ExpoImagePicker (14.0.3):
-    - ExpoModulesCore
-  - ExpoKeepAwake (11.0.1):
-    - ExpoModulesCore
-  - ExpoModulesCore (1.1.1):
-    - React-Core
-    - ReactCommon/turbomodule/core
-  - EXSensors (12.0.1):
-    - ExpoModulesCore
-  - FBLazyVector (0.70.13)
-  - FBReactNativeSpec (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.70.13)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Core (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - Flipper (0.125.0):
-    - Flipper-Folly (~> 2.6)
-    - Flipper-RSocket (~> 1.4)
-  - Flipper-Boost-iOSX (1.76.0.1.11)
-  - Flipper-DoubleConversion (3.2.0.1)
-  - Flipper-Fmt (7.1.7)
-  - Flipper-Folly (2.6.10):
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt (= 7.1.7)
-    - Flipper-Glog
-    - libevent (~> 2.1.12)
-    - OpenSSL-Universal (= 1.1.1100)
-  - Flipper-Glog (0.5.0.5)
-  - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.4.3):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit (0.125.0):
-    - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/Core (0.125.0):
-    - Flipper (~> 0.125.0)
-    - FlipperKit/CppBridge
-    - FlipperKit/FBCxxFollyDynamicConvert
-    - FlipperKit/FBDefines
-    - FlipperKit/FKPortForwarding
-    - SocketRocket (~> 0.6.0)
-  - FlipperKit/CppBridge (0.125.0):
-    - Flipper (~> 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit/FBDefines (0.125.0)
-  - FlipperKit/FKPortForwarding (0.125.0):
-    - CocoaAsyncSocket (~> 7.6)
-    - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.125.0)
-  - FlipperKit/FlipperKitLayoutHelpers (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutTextSearchable
-  - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - FlipperKit/FlipperKitLayoutIOSDescriptors
-    - FlipperKit/FlipperKitLayoutTextSearchable
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitNetworkPlugin
-  - fmt (6.2.1)
-  - glog (0.3.5)
-  - hermes-engine (0.70.13)
-  - libevent (2.1.12)
-  - OpenSSL-Universal (1.1.1100)
-  - RCT-Folly (2021.07.22.00):
-    - boost
-    - DoubleConversion
-    - fmt (~> 6.2.1)
-    - glog
-    - RCT-Folly/Default (= 2021.07.22.00)
-  - RCT-Folly/Default (2021.07.22.00):
-    - boost
-    - DoubleConversion
-    - fmt (~> 6.2.1)
-    - glog
-  - RCT-Folly/Futures (2021.07.22.00):
-    - boost
-    - DoubleConversion
-    - fmt (~> 6.2.1)
-    - glog
-    - libevent
-  - RCTRequired (0.70.13)
-  - RCTTypeSafety (0.70.13):
-    - FBLazyVector (= 0.70.13)
-    - RCTRequired (= 0.70.13)
-    - React-Core (= 0.70.13)
-  - React (0.70.13):
-    - React-Core (= 0.70.13)
-    - React-Core/DevSupport (= 0.70.13)
-    - React-Core/RCTWebSocket (= 0.70.13)
-    - React-RCTActionSheet (= 0.70.13)
-    - React-RCTAnimation (= 0.70.13)
-    - React-RCTBlob (= 0.70.13)
-    - React-RCTImage (= 0.70.13)
-    - React-RCTLinking (= 0.70.13)
-    - React-RCTNetwork (= 0.70.13)
-    - React-RCTSettings (= 0.70.13)
-    - React-RCTText (= 0.70.13)
-    - React-RCTVibration (= 0.70.13)
-  - React-bridging (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-jsi (= 0.70.13)
-  - React-callinvoker (0.70.13)
-  - React-Codegen (0.70.13):
-    - FBReactNativeSpec (= 0.70.13)
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTRequired (= 0.70.13)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Core (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-Core (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.70.13)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/CoreModulesHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/Default (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/DevSupport (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.70.13)
-    - React-Core/RCTWebSocket (= 0.70.13)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-jsinspector (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTActionSheetHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTAnimationHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTBlobHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTImageHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTLinkingHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTNetworkHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTSettingsHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTTextHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTVibrationHeaders (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-Core/RCTWebSocket (0.70.13):
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core/Default (= 0.70.13)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - Yoga
-  - React-CoreModules (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Codegen (= 0.70.13)
-    - React-Core/CoreModulesHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-RCTImage (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-cxxreact (0.70.13):
-    - boost (= 1.76.0)
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-callinvoker (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsinspector (= 0.70.13)
-    - React-logger (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-    - React-runtimeexecutor (= 0.70.13)
-  - React-hermes (0.70.13):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2021.07.22.00)
-    - RCT-Folly/Futures (= 2021.07.22.00)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-jsiexecutor (= 0.70.13)
-    - React-jsinspector (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-  - React-jsi (0.70.13):
-    - boost (= 1.76.0)
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-jsi/Default (= 0.70.13)
-  - React-jsi/Default (0.70.13):
-    - boost (= 1.76.0)
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-  - React-jsiexecutor (0.70.13):
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-  - React-jsinspector (0.70.13)
-  - React-logger (0.70.13):
-    - glog
-  - react-native-cameraroll (5.0.4):
-    - React-Core
-  - react-native-geolocation (3.0.6):
-    - React-Core
-  - react-native-image-resizer (3.0.7):
-    - React-Core
-  - react-native-netinfo (9.3.11):
-    - React-Core
-  - react-native-pager-view (6.0.2):
-    - React-Core
-  - react-native-safe-area-context (4.4.1):
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - ReactCommon/turbomodule/core
-  - react-native-slider (4.3.3):
-    - React-Core
-  - react-native-webview (11.23.1):
-    - React-Core
-  - React-perflogger (0.70.13)
-  - React-RCTActionSheet (0.70.13):
-    - React-Core/RCTActionSheetHeaders (= 0.70.13)
-  - React-RCTAnimation (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTAnimationHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-RCTBlob (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTBlobHeaders (= 0.70.13)
-    - React-Core/RCTWebSocket (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-RCTNetwork (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-RCTImage (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTImageHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-RCTNetwork (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-RCTLinking (0.70.13):
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTLinkingHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-RCTNetwork (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTNetworkHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-RCTSettings (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - RCTTypeSafety (= 0.70.13)
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTSettingsHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-RCTText (0.70.13):
-    - React-Core/RCTTextHeaders (= 0.70.13)
-  - React-RCTVibration (0.70.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Codegen (= 0.70.13)
-    - React-Core/RCTVibrationHeaders (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - ReactCommon/turbomodule/core (= 0.70.13)
-  - React-runtimeexecutor (0.70.13):
-    - React-jsi (= 0.70.13)
-  - ReactCommon/turbomodule/core (0.70.13):
-    - DoubleConversion
-    - glog
-    - RCT-Folly (= 2021.07.22.00)
-    - React-bridging (= 0.70.13)
-    - React-callinvoker (= 0.70.13)
-    - React-Core (= 0.70.13)
-    - React-cxxreact (= 0.70.13)
-    - React-jsi (= 0.70.13)
-    - React-logger (= 0.70.13)
-    - React-perflogger (= 0.70.13)
-  - RNCAsyncStorage (1.17.12):
-    - React-Core
-  - RNCClipboard (1.11.2):
-    - React-Core
-  - RNCMaskedView (0.2.9):
-    - React-Core
-  - RNCPicker (2.4.10):
-    - React-Core
-  - RNDeviceInfo (10.3.1):
-    - React-Core
-  - RNGestureHandler (2.9.0):
-    - React-Core
-  - RNScreens (3.25.0):
-    - React-Core
-    - React-RCTImage
-  - RNSVG (13.7.0):
-    - React-Core
-  - RNSyanImagePicker (0.5.3):
-    - React
-    - TZImagePickerController
-  - SocketRocket (0.6.1)
-  - TZImagePickerController (3.8.3):
-    - TZImagePickerController/Basic (= 3.8.3)
-    - TZImagePickerController/Location (= 3.8.3)
-  - TZImagePickerController/Basic (3.8.3)
-  - TZImagePickerController/Location (3.8.3)
-  - Yoga (1.14.0)
-  - YogaKit (1.18.1):
-    - Yoga (~> 1.14)
-  - ZXingObjC/Core (3.6.5)
-  - ZXingObjC/OneD (3.6.5):
-    - ZXingObjC/Core
-  - ZXingObjC/PDF417 (3.6.5):
-    - ZXingObjC/Core
-
-DEPENDENCIES:
-  - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
-  - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - EXApplication (from `../node_modules/expo-application/ios`)
-  - EXAV (from `../node_modules/expo-av/ios`)
-  - EXBarCodeScanner (from `../node_modules/expo-barcode-scanner/ios`)
-  - EXBrightness (from `../node_modules/expo-brightness/ios`)
-  - EXCamera (from `../node_modules/expo-camera/ios`)
-  - EXConstants (from `../node_modules/expo-constants/ios`)
-  - EXErrorRecovery (from `../node_modules/expo-error-recovery/ios`)
-  - EXFileSystem (from `../node_modules/expo-file-system/ios`)
-  - EXFont (from `../node_modules/expo-font/ios`)
-  - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
-  - EXLocation (from `../node_modules/expo-location/ios`)
-  - Expo (from `../node_modules/expo`)
-  - ExpoImagePicker (from `../node_modules/expo-image-picker/ios`)
-  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
-  - ExpoModulesCore (from `../node_modules/expo-modules-core`)
-  - EXSensors (from `../node_modules/expo-sensors/ios`)
-  - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
-  - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
-  - Flipper (= 0.125.0)
-  - Flipper-Boost-iOSX (= 1.76.0.1.11)
-  - Flipper-DoubleConversion (= 3.2.0.1)
-  - Flipper-Fmt (= 7.1.7)
-  - Flipper-Folly (= 2.6.10)
-  - Flipper-Glog (= 0.5.0.5)
-  - Flipper-PeerTalk (= 0.0.4)
-  - Flipper-RSocket (= 1.4.3)
-  - FlipperKit (= 0.125.0)
-  - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/CppBridge (= 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
-  - FlipperKit/FBDefines (= 0.125.0)
-  - FlipperKit/FKPortForwarding (= 0.125.0)
-  - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitReactPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
-  - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
-  - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - hermes-engine (from `../node_modules/react-native/sdks/hermes/hermes-engine.podspec`)
-  - libevent (~> 2.1.12)
-  - OpenSSL-Universal (= 1.1.1100)
-  - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
-  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
-  - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
-  - React (from `../node_modules/react-native/`)
-  - React-bridging (from `../node_modules/react-native/ReactCommon`)
-  - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
-  - React-Codegen (from `build/generated/ios`)
-  - React-Core (from `../node_modules/react-native/`)
-  - React-Core/DevSupport (from `../node_modules/react-native/`)
-  - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
-  - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
-  - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
-  - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`)
-  - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
-  - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
-  - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
-  - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
-  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
-  - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
-  - "react-native-image-resizer (from `../node_modules/@bam.tech/react-native-image-resizer`)"
-  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
-  - react-native-pager-view (from `../node_modules/react-native-pager-view`)
-  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
-  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
-  - react-native-webview (from `../node_modules/react-native-webview`)
-  - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
-  - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
-  - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
-  - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
-  - React-RCTImage (from `../node_modules/react-native/Libraries/Image`)
-  - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`)
-  - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`)
-  - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
-  - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
-  - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
-  - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`)
-  - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
-  - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
-  - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
-  - "RNCMaskedView (from `../node_modules/@react-native-masked-view/masked-view`)"
-  - "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
-  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
-  - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
-  - RNScreens (from `../node_modules/react-native-screens`)
-  - RNSVG (from `../node_modules/react-native-svg`)
-  - RNSyanImagePicker (from `../node_modules/react-native-syan-image-picker`)
-  - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
-
-SPEC REPOS:
-  trunk:
-    - CocoaAsyncSocket
-    - Flipper
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt
-    - Flipper-Folly
-    - Flipper-Glog
-    - Flipper-PeerTalk
-    - Flipper-RSocket
-    - FlipperKit
-    - fmt
-    - libevent
-    - OpenSSL-Universal
-    - SocketRocket
-    - TZImagePickerController
-    - YogaKit
-    - ZXingObjC
-
-EXTERNAL SOURCES:
-  boost:
-    :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
-  DoubleConversion:
-    :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
-  EXApplication:
-    :path: "../node_modules/expo-application/ios"
-  EXAV:
-    :path: "../node_modules/expo-av/ios"
-  EXBarCodeScanner:
-    :path: "../node_modules/expo-barcode-scanner/ios"
-  EXBrightness:
-    :path: "../node_modules/expo-brightness/ios"
-  EXCamera:
-    :path: "../node_modules/expo-camera/ios"
-  EXConstants:
-    :path: "../node_modules/expo-constants/ios"
-  EXErrorRecovery:
-    :path: "../node_modules/expo-error-recovery/ios"
-  EXFileSystem:
-    :path: "../node_modules/expo-file-system/ios"
-  EXFont:
-    :path: "../node_modules/expo-font/ios"
-  EXImageLoader:
-    :path: "../node_modules/expo-image-loader/ios"
-  EXLocation:
-    :path: "../node_modules/expo-location/ios"
-  Expo:
-    :path: "../node_modules/expo"
-  ExpoImagePicker:
-    :path: "../node_modules/expo-image-picker/ios"
-  ExpoKeepAwake:
-    :path: "../node_modules/expo-keep-awake/ios"
-  ExpoModulesCore:
-    :path: "../node_modules/expo-modules-core"
-  EXSensors:
-    :path: "../node_modules/expo-sensors/ios"
-  FBLazyVector:
-    :path: "../node_modules/react-native/Libraries/FBLazyVector"
-  FBReactNativeSpec:
-    :path: "../node_modules/react-native/React/FBReactNativeSpec"
-  glog:
-    :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
-  hermes-engine:
-    :podspec: "../node_modules/react-native/sdks/hermes/hermes-engine.podspec"
-  RCT-Folly:
-    :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
-  RCTRequired:
-    :path: "../node_modules/react-native/Libraries/RCTRequired"
-  RCTTypeSafety:
-    :path: "../node_modules/react-native/Libraries/TypeSafety"
-  React:
-    :path: "../node_modules/react-native/"
-  React-bridging:
-    :path: "../node_modules/react-native/ReactCommon"
-  React-callinvoker:
-    :path: "../node_modules/react-native/ReactCommon/callinvoker"
-  React-Codegen:
-    :path: build/generated/ios
-  React-Core:
-    :path: "../node_modules/react-native/"
-  React-CoreModules:
-    :path: "../node_modules/react-native/React/CoreModules"
-  React-cxxreact:
-    :path: "../node_modules/react-native/ReactCommon/cxxreact"
-  React-hermes:
-    :path: "../node_modules/react-native/ReactCommon/hermes"
-  React-jsi:
-    :path: "../node_modules/react-native/ReactCommon/jsi"
-  React-jsiexecutor:
-    :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
-  React-jsinspector:
-    :path: "../node_modules/react-native/ReactCommon/jsinspector"
-  React-logger:
-    :path: "../node_modules/react-native/ReactCommon/logger"
-  react-native-cameraroll:
-    :path: "../node_modules/@react-native-camera-roll/camera-roll"
-  react-native-geolocation:
-    :path: "../node_modules/@react-native-community/geolocation"
-  react-native-image-resizer:
-    :path: "../node_modules/@bam.tech/react-native-image-resizer"
-  react-native-netinfo:
-    :path: "../node_modules/@react-native-community/netinfo"
-  react-native-pager-view:
-    :path: "../node_modules/react-native-pager-view"
-  react-native-safe-area-context:
-    :path: "../node_modules/react-native-safe-area-context"
-  react-native-slider:
-    :path: "../node_modules/@react-native-community/slider"
-  react-native-webview:
-    :path: "../node_modules/react-native-webview"
-  React-perflogger:
-    :path: "../node_modules/react-native/ReactCommon/reactperflogger"
-  React-RCTActionSheet:
-    :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
-  React-RCTAnimation:
-    :path: "../node_modules/react-native/Libraries/NativeAnimation"
-  React-RCTBlob:
-    :path: "../node_modules/react-native/Libraries/Blob"
-  React-RCTImage:
-    :path: "../node_modules/react-native/Libraries/Image"
-  React-RCTLinking:
-    :path: "../node_modules/react-native/Libraries/LinkingIOS"
-  React-RCTNetwork:
-    :path: "../node_modules/react-native/Libraries/Network"
-  React-RCTSettings:
-    :path: "../node_modules/react-native/Libraries/Settings"
-  React-RCTText:
-    :path: "../node_modules/react-native/Libraries/Text"
-  React-RCTVibration:
-    :path: "../node_modules/react-native/Libraries/Vibration"
-  React-runtimeexecutor:
-    :path: "../node_modules/react-native/ReactCommon/runtimeexecutor"
-  ReactCommon:
-    :path: "../node_modules/react-native/ReactCommon"
-  RNCAsyncStorage:
-    :path: "../node_modules/@react-native-async-storage/async-storage"
-  RNCClipboard:
-    :path: "../node_modules/@react-native-clipboard/clipboard"
-  RNCMaskedView:
-    :path: "../node_modules/@react-native-masked-view/masked-view"
-  RNCPicker:
-    :path: "../node_modules/@react-native-picker/picker"
-  RNDeviceInfo:
-    :path: "../node_modules/react-native-device-info"
-  RNGestureHandler:
-    :path: "../node_modules/react-native-gesture-handler"
-  RNScreens:
-    :path: "../node_modules/react-native-screens"
-  RNSVG:
-    :path: "../node_modules/react-native-svg"
-  RNSyanImagePicker:
-    :path: "../node_modules/react-native-syan-image-picker"
-  Yoga:
-    :path: "../node_modules/react-native/ReactCommon/yoga"
-
-SPEC CHECKSUMS:
-  boost: a7c83b31436843459a1961bfd74b96033dc77234
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  EXApplication: 034b1c40a8e9fe1bff76a1e511ee90dff64ad834
-  EXAV: 8e4e12377926c071843498d19adfa27802695385
-  EXBarCodeScanner: 50ad56220f9d543d4fe8884c0d3d46eae628b244
-  EXBrightness: 1725afacfdaeb4724bb949c44384cff0ef0d7d18
-  EXCamera: d7e91d5857faee493ca3cf8dafd42572db61849e
-  EXConstants: 3c86653c422dd77e40d10cbbabb3025003977415
-  EXErrorRecovery: ae43433feb0608a64dc5b1c8363b3e7769a9ea24
-  EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
-  EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
-  EXImageLoader: 84b65e6bd9d3345d6fbb3ab936a546c54496a64d
-  EXLocation: 7d08926d931f4fb619bfa25e73669f1e19b102c6
-  Expo: 5f4240506a147162542178989696e56e3dd72924
-  ExpoImagePicker: ce37302446e70145bb413f0f74886441abdae022
-  ExpoKeepAwake: 69b59d0a8d2b24de9f82759c39b3821fec030318
-  ExpoModulesCore: 485dff3a59b036a33b6050c0a5aea3cf1037fdd1
-  EXSensors: c4d17812887f3b8bec1da3c1e501a1d7b02bf19d
-  FBLazyVector: b2ab2b9a9e8e1917caf61518a5fa37bdac445202
-  FBReactNativeSpec: 4df8af73da797c1ec9ccd4418cf14fd21c19b8ab
-  Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
-  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
-  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
-  Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
-  Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
-  Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
-  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
-  FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
-  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  hermes-engine: 724382db3322a3745b0741d753bbe70e26927aac
-  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
-  RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda
-  RCTRequired: 66ec53b22edfc02ffdacdcea5fca23793210f024
-  RCTTypeSafety: 57667853547bee8a337094a90baf2229b357b77b
-  React: ca29d529fd759c450885ae66459eda09af4b6799
-  React-bridging: e2b44ac35e808f39cb7641bba0697c6a72af85c8
-  React-callinvoker: 4eaf30b7fadb3e02e4c7ccf9dbbf50fa678b1d72
-  React-Codegen: 27742daceea85e4c6c687ffd86f595ef7159504d
-  React-Core: 2d8b91984ad6efa0bb026c83d0fe48d4d0970df8
-  React-CoreModules: 7496e1a17ddd885a5cef5ab69c35a4a17672ec23
-  React-cxxreact: ab222c5e7a2b55b13879b06127326c58581e9edc
-  React-hermes: 5b390ae6b6b0d6ecdd83f793b6aafb3f6ce30f51
-  React-jsi: 3e6c3765b3ff8d901a791b80186c7023bcac00ab
-  React-jsiexecutor: d8f0acf9aa7f2679eb393e2cfa4b05081df1a679
-  React-jsinspector: 73a7091c79023e28f475595c0a1d84d6ba340db7
-  React-logger: 007e00696fcb7f76eee81070d005da5c9ca119be
-  react-native-cameraroll: 38b40d9033e4077b6c603f92f95c6d05fa7907df
-  react-native-geolocation: 0f7fe8a4c2de477e278b0365cce27d089a8c5903
-  react-native-image-resizer: 681f7607418b97c084ba2d0999b153b103040d8a
-  react-native-netinfo: 3a48f51c18dbd9253440621955e11de71bc51b32
-  react-native-pager-view: 592421df0259bf7a7a4fe85b74c24f3f39905605
-  react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a
-  react-native-slider: 7d19220da2f2ae7cbb9aa80127cb73c597fa221f
-  react-native-webview: d33e2db8925d090871ffeb232dfa50cb3a727581
-  React-perflogger: c6702b0cb84be970b5fcb230162a229195295ece
-  React-RCTActionSheet: cbe5a12f5417120bbc03c105c9ea9a4c6d2b5d84
-  React-RCTAnimation: ac313d82cac7b1c90dd817de5eca6d367c66d588
-  React-RCTBlob: 6a2c2a86d137f0911c81d8c1886cf41f9f48e0f7
-  React-RCTImage: 47518a146fbe83477a17b20be2912b6250c604f9
-  React-RCTLinking: 10da49d4b21493e63c558c64a087e6e97ca4cc2c
-  React-RCTNetwork: 5ea0d1627db5e51aa14e74ca8ef14e619d1846f8
-  React-RCTSettings: 032bec4c18089f69e276f61232573baad638d648
-  React-RCTText: 0f63c9bcc5fcca84a75e214551de63bca7794915
-  React-RCTVibration: 3b0e5f51cf2e6a1f8a7f36d50157bad0bfa4b984
-  React-runtimeexecutor: 9ea931b43e2c2eb3c66ccdefcba8ff00cb523e09
-  ReactCommon: a24276ab12f11099c91af00f7cf2c89d5f55313f
-  RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b
-  RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
-  RNCMaskedView: 949696f25ec596bfc697fc88e6f95cf0c79669b6
-  RNCPicker: 0bc2f0a29abcca7b7ed44a2d036aac9ab6d25700
-  RNDeviceInfo: 468a7cd19ad2b6697bab25c8baebf22c0603cb7c
-  RNGestureHandler: 071d7a9ad81e8b83fe7663b303d132406a7d8f39
-  RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa
-  RNSVG: d787d64ca06b9158e763ad2638a8c4edce00782a
-  RNSyanImagePicker: 5c650d33f16f7cd59c47d9269f6c4856b30d7616
-  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  TZImagePickerController: e9909edbadf7381140efc5b5c9f5bdbfd630f7d4
-  Yoga: 445485143df46a9d5d4ef61cbbc629fec40fb9a0
-  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
-  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
-
-PODFILE CHECKSUM: c500841d0cd00b84fdb1d6b4c1b8833eab606c22
-
-COCOAPODS: 1.14.2

src/components/basic/Buttons.tsx

@@ -49,7 +49,6 @@ export default function Buttons(props: {
 
     if (props.type == ButtonType.text) {
         mainClass = 'texted'
-
         return <View style={{ opacity: (props.lowLight || props.disabled) ? 0.4 : 1 }} onClick={onClick}>
             <Text
                 style={{
@@ -81,12 +80,10 @@ export default function Buttons(props: {
             </View>
         )
     }
-    // else {
-    //     mainClass = 'puretext'
-    //     textClass = 'puretext_text'
-    // }
+
+    
     return (
-        <View className={mainClass} style={{ ...props.btnStyle, opacity: props.lowLight ? 0.4 : 1 }} onClick={onClick}>
+        <View className={mainClass} style={{ ...props.btnStyle, opacity: (props.lowLight || props.disabled) ? 0.4 : 1 }} onClick={onClick}>
             {
                 props.showLoading && <View style={{ marginBottom: 2, marginRight: 5 }}>
                     <AtActivityIndicator size={32} color={props.lightLoading ? '#999' : '#000'} />
@@ -101,15 +98,6 @@ export default function Buttons(props: {
                     marginBottom: 2
                 }}>{props.title}</Text>
         </View>
-        // <View  onClick={onClick}>
-        //     <Text 
-        //         style={{
-        //             height: props.btnStyle.height,
-        //             lineHeight: props.btnStyle.height,
-        //             color: props.btnStyle.color,
-        //             fontSize: props.btnStyle.fontSize
-        //         }}>{props.title}</Text>
-        // </View>
     )
 }
 

src/context/locales/index.ts

@@ -16,7 +16,7 @@ function getLanguageSetting() {
     }
   }
   else {
-    initLocale('en')
+    initLocale('zh')
   }
 }
 

src/context/locales/zh.js

@@ -50,6 +50,7 @@ export default {
             btn_create_account: '',
             btn_login: '登录',
             btn_wechat: '微信登录',
+            btn_signup:'注册',
             slogan:'健康生物钟'
         },
         auth: {

src/features/auth/components/Auth.scss

@@ -28,7 +28,7 @@
     opacity: 0.4;
 }
 
-.login{
+.login2{
     font-size: 28px;
-    color: $themeColor;
+    color: $fastColor;
 }

src/features/auth/components/CreateAccount.tsx

@@ -3,15 +3,20 @@ import Buttons from "@/components/basic/Buttons";
 import Inputs from "@/components/input/Inputs";
 import Texts from "@/components/basic/Texts";
 import { ComponentStatus, TextType } from "@/utils/types";
-import { View,Image,Text } from "@tarojs/components";
+import { View, Image, Text } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import check from '@/assets/svg/check.svg'
 import './Auth.scss'
 import { jumpPage } from "@/features/trackTimeDuration/hooks/Common";
+import { ColorType } from "@/context/themes/color";
+let useNavigation;
+if (process.env.TARO_ENV == 'rn') {
+  useNavigation = require("@react-navigation/native").useNavigation
+}
 
-export default function Component(props:{login:()=>void}) {
+export default function Component(props: { login: () => void }) {
   const { t } = useTranslation()
   const [name, setName] = useState('');
   const [email, setEmail] = useState('');
@@ -21,14 +26,18 @@ export default function Component(props:{login:()=>void}) {
   const handleEmailChange = (value: string) => {
     setEmail(value);
   };
+  let navigation;
+  if (useNavigation) {
+    navigation = useNavigation()
+  }
 
   const isButtonDisabled = name === '' || email === '';
 
   function signupComponent() {
     return <View>
-      <Inputs value={name} onChange={handleNameChange} placeholder={t('feature.auth.create_account.input_username_placeholder')}></Inputs>
+      <Inputs value={name} onChange={handleNameChange} onConfirm={(e) => { }} placeholder={t('feature.auth.create_account.input_username_placeholder')}></Inputs>
       <View style={{ height: 20 }} />
-      <Inputs value={email} onChange={handleEmailChange} placeholder={t('feature.auth.create_account.input_email_placeholder')}></Inputs>
+      <Inputs value={email} onChange={handleEmailChange} onConfirm={(e) => { }} placeholder={t('feature.auth.create_account.input_email_placeholder')}></Inputs>
     </View>
   }
 
@@ -39,28 +48,26 @@ export default function Component(props:{login:()=>void}) {
     global.username = name
     global.email = email
     setTimeout(() => {
-      jumpPage(`/pages/Auth?type=createPassword&name=${name}&email=${email}`)
+      jumpPage(`/pages/Auth?type=createPassword&name=${name}&email=${email}`, 'Auth', navigation,{
+        type:'createPassword',
+        name:name,
+        email:email
+      })
     }, 1000)
-
-    // setTimeout(() => {
-    //     Taro.navigateBack()
-    //     Taro.redirectTo({
-    //         url: '/pages/ChooseScenario'
-    //     })
-    // },1000)
   }
 
-
-  return <View style={{ backgroundColor: '#000', flex: 1, flexDirection: 'column', display: 'flex', width: '100%', height: '100%' }}>
+  return <View style={{ width: '100%', height: '100%' }}>
     <Texts text={t('feature.auth.create_account.title')} type={TextType.primary}></Texts>
     <Texts text={t('feature.auth.create_account.sub_title')} type={TextType.secondary}></Texts>
-    <Box children={signupComponent()}></Box>
-
+    {
+      signupComponent()
+    }
     <Buttons
       onClick={registerF}
       title={t('feature.auth.create_account.btn_next')}
-      style={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20 }}
-      status={isButtonDisabled ? ComponentStatus.disable : ComponentStatus.enable}></Buttons>
+      btnStyle={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20, height: 44, borderRadius: 22, backgroundColor: ColorType.fast }}
+      disabled={isButtonDisabled}
+    ></Buttons>
     <View className="agree_view">
       <Image style='width:12px;height:12px;' src={check} />
       <Text className='agree_text'>{t('page.auth.agreement')}</Text>
@@ -68,7 +75,7 @@ export default function Component(props:{login:()=>void}) {
     <View style={{ flex: 1 }} />
     <View className="footer">
       <Text className="have_account">{t('feature.auth.create_account.footer_desc')}</Text>
-      <Text className="login" onClick={() => props.login()}>{t('feature.auth.create_account.footer_login')}</Text>
+      <Text className="login2" onClick={() => props.login()}>{t('feature.auth.create_account.footer_login')}</Text>
     </View>
   </View>
 }

src/features/auth/components/CreatePassword.tsx

@@ -11,8 +11,15 @@ import check from '@/assets/svg/check.svg'
 import './Auth.scss'
 import Taro from "@tarojs/taro";
 import { register } from "@/services/user";
+import { ColorType } from "@/context/themes/color";
+import { registerSuccess } from "@/store/user";
 
-export default function Component(prop: { name: string, email: string }) {
+let useNavigation;
+if (process.env.TARO_ENV == 'rn') {
+  useNavigation = require("@react-navigation/native").useNavigation
+}
+
+export default function Component(prop: { name?: string, email?: string }) {
   const { t } = useTranslation()
   const dispatch = useDispatch();
 
@@ -29,6 +36,11 @@ export default function Component(prop: { name: string, email: string }) {
   const isButtonDisabled = password === '' || repeat === '';
 
   const user = useSelector((state: any) => state.user);
+  let navigation;
+  if (useNavigation) {
+    navigation = useNavigation()
+  }
+
 
   useEffect(() => {
     if (user.isLogin) {
@@ -43,9 +55,9 @@ export default function Component(prop: { name: string, email: string }) {
 
   function loginComponent() {
     return <View>
-      <Inputs value={password} isSecure={true} onChange={handlePasswordChange} placeholder={t('feature.auth.create_password.input_password_placeholder')}></Inputs>
+      <Inputs value={password} isSecure={true} onChange={handlePasswordChange} onConfirm={(e) => { }} placeholder={t('feature.auth.create_password.input_password_placeholder')}></Inputs>
       <View style={{ height: 20 }} />
-      <Inputs value={repeat} isSecure={true} onChange={handleRepeatChange} placeholder={t('feature.auth.create_password.input_password_confirm_placeholder')}></Inputs>
+      <Inputs value={repeat} isSecure={true} onChange={handleRepeatChange} onConfirm={(e) => { }} placeholder={t('feature.auth.create_password.input_password_confirm_placeholder')}></Inputs>
     </View>
   }
 
@@ -53,22 +65,30 @@ export default function Component(prop: { name: string, email: string }) {
     if (isButtonDisabled) {
       return;
     }
-    dispatch(register(
+
+    register(
       global.username,
       global.email,
       password
-    ) as any);
+    ).then(res => {
+      console.log('oppsu2')
+      dispatch(registerSuccess(res))
+      navigation.goBack(3)
+    }).catch(e => {
+      console.log('oppsu')
+    })
   }
 
-  return <View style={{ backgroundColor: '#000', flex: 1, flexDirection: 'column', display: 'flex', width: '100vw', height: '100vh' }}>
+  return <View style={{ backgroundColor: '#000', width: '100%', height: '100%' }}>
     <Texts text={t('feature.auth.create_password.title')} type={TextType.primary}></Texts>
     <Texts text={t('feature.auth.create_password.sub_title')} type={TextType.secondary}></Texts>
-    <Box children={loginComponent()}></Box>
+    {loginComponent()}
     <Buttons
       onClick={registerF}
       title={t('feature.auth.create_password.btn_next')}
-      style={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20 }}
-      status={isButtonDisabled ? ComponentStatus.disable : ComponentStatus.enable}></Buttons>
+      btnStyle={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20, height: 44, borderRadius: 22, backgroundColor: ColorType.fast }}
+      disabled={isButtonDisabled}
+    ></Buttons>
     <View className="agree_view">
       <Image style='width:12px;height:12px;' src={check} />
       <Text className='agree_text'>{t('page.auth.agreement')}</Text>
@@ -76,7 +96,7 @@ export default function Component(prop: { name: string, email: string }) {
     <View style={{ flex: 1 }} />
     <View className="footer">
       <Text className="have_account">{t('feature.auth.create_password.footer_desc')}</Text>
-      <Text className="login">{t('feature.auth.create_password.footer_login')}</Text>
+      <Text className="login2">{t('feature.auth.create_password.footer_login')}</Text>
     </View>
   </View>
 }

src/features/auth/components/login.tsx

@@ -11,6 +11,7 @@ import './Auth.scss'
 import { login } from "@/services/user";
 import { useDispatch, useSelector } from "react-redux";
 import Taro from "@tarojs/taro";
+import { ColorType } from "@/context/themes/color";
 
 export default function Login(props: { register: () => void }) {
     const { t } = useTranslation()
@@ -49,9 +50,9 @@ export default function Login(props: { register: () => void }) {
 
     function loginComponent() {
         return <View>
-            <Inputs value={name} onChange={handleNameChange} placeholder={t('feature.auth.login.input_account_placeholder')}></Inputs>
+            <Inputs value={name} onChange={handleNameChange} onConfirm={(e)=>{}} placeholder={t('feature.auth.login.input_account_placeholder')}></Inputs>
             <View style={{ height: 20 }} />
-            <Inputs value={password} isSecure={true} onChange={handlePasswordChange} placeholder={t('feature.auth.login.input_password_placeholder')}></Inputs>
+            <Inputs value={password} isSecure={true} onChange={handlePasswordChange} onConfirm={(e)=>{}} placeholder={t('feature.auth.login.input_password_placeholder')}></Inputs>
         </View>
     }
 
@@ -62,12 +63,34 @@ export default function Login(props: { register: () => void }) {
         dispatch(login(name, password) as any);
     }
 
+    return <View style={{width: '100%', height: '100%'}}>
+        <Texts text={'App Name'} type={TextType.primary}></Texts>
+        {
+            loginComponent()
+        }
+        <Buttons
+            onClick={LoginF}
+            title={t('feature.auth.create_account.btn_next')}
+            btnStyle={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20,height:44,borderRadius:22,backgroundColor:ColorType.fast }}
+            disabled={isLoginButtonDisabled}></Buttons>
+
+        <View className="agree_view">
+            <Image style='width:12px;height:12px;' src={check} />
+            <Text className='agree_text'>{t('page.auth.agreement')}</Text>
+        </View>
+        <View style={{ flex: 1 }} />
+        <View className="footer">
+            <Text className="have_account">{t('feature.auth.login.footer_desc')}</Text>
+            <Text className="login2" onClick={() => props.register()}>{t('feature.auth.login.footer_sign_up')}</Text>
+        </View>
+    </View>
+
     return <View style={{ backgroundColor: '#000', flex: 1, flexDirection: 'column', display: 'flex', width: '100%', height: '100%' }}>
         <Texts text={'App Name'} type={TextType.primary}></Texts>
         {/* <Texts text={t('feature.auth.create_account.sub_title')} type={TextType.secondary}></Texts> */}
         <Box children={loginComponent()}></Box>
 
-        <Buttons
+        {/* <Buttons
             onClick={LoginF}
             title={t('feature.auth.create_account.btn_next')}
             style={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20 }}
@@ -76,11 +99,11 @@ export default function Login(props: { register: () => void }) {
         <View className="agree_view">
             <Image style='width:12px;height:12px;' src={check} />
             <Text className='agree_text'>{t('page.auth.agreement')}</Text>
-        </View>
+        </View> */}
         <View style={{ flex: 1 }} />
         <View className="footer">
             <Text className="have_account">{t('feature.auth.login.footer_desc')}</Text>
-            <Text className="login" onClick={() => props.register()}>{t('feature.auth.login.footer_sign_up')}</Text>
+            <Text className="login2" onClick={() => props.register()}>{t('feature.auth.login.footer_sign_up')}</Text>
         </View>
     </View>
 }

src/features/common/SpecBtns.tsx

@@ -22,7 +22,7 @@ export const StartFastBtn = (props: { onClick: Function, isLoading?: boolean })
             btnStyle={{
                 height: rpxToPx(100),
                 borderRadius: rpxToPx(50),
-                backgroundColor: global.fastColor?global.fastColor:ColorType.fast,
+                backgroundColor: global.fastColor ? global.fastColor : ColorType.fast,
                 width: rpxToPx(320),
                 // paddingLeft: 40,
                 // paddingRight: 40,
@@ -46,7 +46,7 @@ export const StartSleepBtn = (props: { onClick: Function, lowLight?: boolean, is
             btnStyle={{
                 height: rpxToPx(100),
                 borderRadius: rpxToPx(50),
-                backgroundColor: global.sleepColor?global.sleepColor:ColorType.sleep,
+                backgroundColor: global.sleepColor ? global.sleepColor : ColorType.sleep,
                 width: rpxToPx(320),
                 // paddingLeft: 40,
                 // paddingRight: 40,
@@ -72,13 +72,13 @@ export const EndSleepBtn = (props: { onClick: Function, lowLight?: boolean, isLo
             btnStyle={{
                 height: rpxToPx(100),
                 borderRadius: rpxToPx(50),
-                borderColor: global.sleepColor?global.sleepColor:ColorType.sleep,
+                borderColor: global.sleepColor ? global.sleepColor : ColorType.sleep,
                 borderWidth: 2,
                 borderStyle: 'solid',
                 width: rpxToPx(320),
                 // paddingLeft: 40,
                 // paddingRight: 40,
-                color: global.sleepColor?global.sleepColor:ColorType.sleep,
+                color: global.sleepColor ? global.sleepColor : ColorType.sleep,
                 fontWeight: 'bold',
                 fontSize: 20,
                 display: 'flex',
@@ -100,13 +100,13 @@ export const EndFastBtn = (props: { onClick: Function, lowLight?: boolean, isLoa
             btnStyle={{
                 height: rpxToPx(100),
                 borderRadius: rpxToPx(50),
-                borderColor: global.fastColor?global.fastColor:ColorType.fast,
+                borderColor: global.fastColor ? global.fastColor : ColorType.fast,
                 borderWidth: 2,
                 borderStyle: 'solid',
                 width: rpxToPx(320),
                 // paddingLeft: 40,
                 // paddingRight: 40,
-                color: global.fastColor?global.fastColor:ColorType.fast,
+                color: global.fastColor ? global.fastColor : ColorType.fast,
                 fontSize: 20,
                 fontWeight: 'bold',
                 display: 'flex',
@@ -118,17 +118,18 @@ export const EndFastBtn = (props: { onClick: Function, lowLight?: boolean, isLoa
     )
 }
 
-export const SetScheduleBtn = (props: { onClick: Function, title: string, isFast?: boolean, lowLight?: boolean }) => {
+export const SetScheduleBtn = (props: { onClick: Function, title: string, isFast?: boolean, lowLight?: boolean, disable?: boolean }) => {
     return (
         <Buttons title={props.title} type={ButtonType.elevated}
             onClick={() => { props.onClick() }}
             lowLight={props.lowLight ? props.lowLight : false}
+            disabled={props.disable}
             btnStyle={{
                 height: 50,
                 width: 300,
                 boxSizing: 'border-box',
                 borderRadius: 25,
-                backgroundColor: props.isFast ? global.fastColor?global.fastColor:ColorType.fast : global.sleepColor?global.sleepColor:ColorType.sleep,
+                backgroundColor: props.isFast ? global.fastColor ? global.fastColor : ColorType.fast : global.sleepColor ? global.sleepColor : ColorType.sleep,
                 paddingLeft: 40,
                 paddingRight: 40,
                 color: 'black',
@@ -151,7 +152,7 @@ export const ChooseScenarioBtn = (props: { onClick: Function, title: string, bac
                 width: 300,
                 boxSizing: 'border-box',
                 borderRadius: 25,
-                background: props.background,
+                backgroundColor: props.background,
                 paddingLeft: 40,
                 paddingRight: 40,
                 color: 'black',
@@ -165,7 +166,7 @@ export const ChooseScenarioBtn = (props: { onClick: Function, title: string, bac
     )
 }
 
-export const RecordMetricBtn = (props: { onClick: Function, title: string, themeColor: string,isDisable?:boolean }) => {
+export const RecordMetricBtn = (props: { onClick: Function, title: string, themeColor: string, isDisable?: boolean }) => {
     return (
         <PostBtn title={props.title} type={ButtonType.elevated}
             onClick={() => { props.onClick() }}

src/features/trackTimeDuration/components/SetSchedule.tsx

@@ -32,6 +32,7 @@ export default function Component() {
 
   const [isOpen, setIsOpen] = useState(false)
   const [isTimeOpen, setIsTimeOpen] = useState(false)
+  const [btnDisable,setBtnDisable] = useState(false)
 
   const pickerRef = useRef<any>(null);
   // const [count,setCount] = useState(0)
@@ -162,6 +163,7 @@ export default function Component() {
   }
 
   function commit() {
+    setBtnDisable(true)
     setPlan({
       scenario: scenario.name,
       schedule: {
@@ -174,9 +176,12 @@ export default function Component() {
         }
       }
     }).then(res => {
+      setBtnDisable(false)
       dispatch(setStep('fast'))
       global.checkData()
       Taro.navigateBack({ delta: 4 })
+    }).catch(e=>{
+      setBtnDisable(false)
     })
   }
 
@@ -348,6 +353,7 @@ export default function Component() {
         <SetScheduleBtn title={(scenario.step == 'fast' && scenario.name == 'FAST_SLEEP') ? t('feature.common.btn_set_and_next') : t('feature.common.btn_set_and_done')}
           lowLight={operateType != 0}
           isFast={scenario.step == 'fast'}
+          disable={btnDisable}
           onClick={() => start()} />
       </Footer>
       {

src/features/trackTimeDuration/hooks/Common.tsx

@@ -16,9 +16,12 @@ export const getThemeColor = (time: any) => {
     }
 }
 
-export const jumpPage = (url?: string, pageName?: string, navigation?: any) => {
+export const jumpPage = (url?: string, pageName?: string, navigation?: any, params?: any) => {
     if (process.env.TARO_ENV == 'rn') {
-        navigation.navigate(pageName);
+        if (params){
+            console.log(params)
+        }
+        navigation.push(pageName,params);
     }
     else {
         Taro.navigateTo({

src/pages/account/Auth.tsx

@@ -1,13 +1,20 @@
 import Taro, { useRouter } from "@tarojs/taro";
-import Auth from "@features/auth/components/Auth";
+import Auth1 from "@features/auth/components/Auth";
 import CreatePassword from "@features/auth/components/CreatePassword";
 import { View } from "@tarojs/components";
 
 
-export default function Page() {
+export default function Page(props) {
+    
+    console.log('apple')
     const router = useRouter();
+
+    var type = router.params.type
+    if (props.route && props.route.params){
+        type = props.route.params.type
+    }
     
-    return <View  style={{backgroundColor:'#000'}}>{
-        router.params.type === 'createPassword' ? <CreatePassword /> : <Auth/>
+    return <View>{
+        type === 'createPassword' ? <CreatePassword /> : <Auth1/>
     }</View>
 }

src/pages/account/ChooseAuth.tsx

@@ -11,6 +11,10 @@ import { ColorType } from "@/context/themes/color";
 import { ChooseScenarioBtn } from "@/features/common/SpecBtns";
 import { useTranslation } from "react-i18next";
 import { jumpPage } from "@/features/trackTimeDuration/hooks/Common";
+let useNavigation;
+if (process.env.TARO_ENV == 'rn') {
+    useNavigation = require("@react-navigation/native").useNavigation
+}
 
 export default function Page() {
     const dispatch = useDispatch();
@@ -18,6 +22,10 @@ export default function Page() {
     var code = '';
 
     const user = useSelector((state: any) => state.user);
+    let navigation;
+    if (useNavigation){
+        navigation = useNavigation()
+    }
 
     useEffect(() => {
         if (user.isLogin) {
@@ -60,14 +68,18 @@ export default function Page() {
         // }
     }
 
-    function createAccount() {
-        jumpPage('/pages/account/Auth')
+    function createAccount1() {
+        jumpPage('/pages/account/Auth','Auth',navigation)
     }
 
     return <View className="container choose_container">
         <Texts text='fast16cc' type={TextType.big} />
         <Text className="slogan">{t('page.choose_auth.slogan')}</Text>
-        <ChooseScenarioBtn title={t('page.choose_auth.btn_wechat')} onClick={login} background={ColorType.fast} />
+        {
+            process.env.TARO_ENV=='weapp'?<ChooseScenarioBtn title={t('page.choose_auth.btn_wechat')} onClick={login} background={ColorType.fast} />:
+            <ChooseScenarioBtn title={t('page.choose_auth.btn_signup')} onClick={createAccount1} background={ColorType.fast} />
+        }
+        {/* <ChooseScenarioBtn title={t('page.choose_auth.btn_wechat')} onClick={login} background={ColorType.fast} /> */}
         {/* <View style={{ height: 100 }} /> */}
 
         {/* <Buttons title='微信登录' onClick={login} btnStyle={{ width: 289, marginBottom: 30,backgroundColor:ColorType.fast }} /> */}

src/pages/clock/Clock.rn.tsx

@@ -41,23 +41,70 @@ import { TimeFormatter } from '@/utils/time_format'
 import NoData from '@/components/view/NoData'
 import { ColorType } from '@/context/themes/color'
 import { jumpPage } from '@/features/trackTimeDuration/hooks/Common'
+import { IconRadio, IconRadioCheck, IconRadioCross, IconSwitchOff } from '@/components/basic/Icons'
+import Rings from '@/components/view/Rings.rn'
+import { PanGestureHandler } from 'react-native-gesture-handler'
+import { Svg, Circle } from 'react-native-svg';
+import { PanResponder } from 'react-native'
 // import TabBar from '../../components/Tabbar';
 
 // import Rings from '@components/view/Rings';
 
 let useNavigation;
-if (process.env.TARO_ENV=='rn'){
-    useNavigation = require("@react-navigation/native").useNavigation
+if (process.env.TARO_ENV == 'rn') {
+  useNavigation = require("@react-navigation/native").useNavigation
 }
 
 
 export default function IndexPage() {
   let navigation;
-    if (useNavigation){
-        navigation = useNavigation()
-    }
+  if (useNavigation) {
+    navigation = useNavigation()
+  }
+
+
+  function MyComponent() {
+    const circleRef = useRef(null);
+
+    const panResponder = PanResponder.create({
+      onStartShouldSetPanResponder: () => true,
+      onPanResponderMove: (event, gestureState) => {
+        const { dx, dy } = gestureState;
+        if (circleRef.current) {
+          circleRef.current.setNativeProps({
+            cx: circleRef.current.props.cx + dx,
+            cy: circleRef.current.props.cy + dy,
+          });
+        }
+      },
+    });
+
+    return (
+      <View>
+        <PanGestureHandler {...panResponder.panHandlers}>
+          <Svg width={200} height={200}>
+            <Circle
+              ref={circleRef}
+              cx={100}
+              cy={100}
+              r={50}
+              fill="red"
+            />
+          </Svg>
+        </PanGestureHandler>
+      </View>
+    );
+  }
   return <View >
     <View style={{ width: 100, height: 100, borderWidth: 2, borderColor: 'pink' }}></View>
+    {
+      MyComponent()
+    }
+    <IconRadio width={16} color='red' />
+    <IconRadioCheck width={16} color='yellow' />
+    <IconRadioCross width={25} color='pink' />
+    <IconSwitchOff width={40} height={40} />
+    <Rings strokeWidth={10} radius={100} color='#00ffff' />
   </View>
   const dispatch = useDispatch();
   const { t } = useTranslation()
@@ -249,7 +296,7 @@ export default function IndexPage() {
 
   function tapClock() {
     if (!user.isLogin) {
-      jumpPage('/pages/account/ChooseAuth','ChooseAuth',navigation)
+      jumpPage('/pages/account/ChooseAuth', 'ChooseAuth', navigation)
     }
   }
 

src/pages/rn/RNMain.tsx

@@ -8,6 +8,7 @@ import Metric from '../metric/Metric'
 import Activity from '../activity/Activity'
 import Profile from '../account/Profile'
 import ChooseAuth from '@/pages/account/ChooseAuth'
+import Auth from '@/pages/account/Auth'
 import { View } from '@tarojs/components';
 
 // 创建底部 Tab 导航器
@@ -95,6 +96,7 @@ export default function RNMain() {
       })}>
         <Stack.Screen name='Main' component={tabNavigator} options={{ headerShown: false }}/>
         <Stack.Screen name='ChooseAuth' component={ChooseAuth} />
+        <Stack.Screen name='Auth' component={Auth} />
       </Stack.Navigator>
     </NavigationContainer>
   )

src/services/http/request.ts

@@ -57,6 +57,7 @@ export async function request<T>(param: RequestParam): Promise<T> {
         var split = new Date().toString().split(' ');
         var timeZoneFormatted = split[split.length - 2];
 
+        header['content-type'] = 'application/json'
         header['X-Time-Zone'] = timeZoneFormatted; //new Date().getTimezoneOffset() / 60
         header['X-Platform'] = 'IOS'; //IOS ANDROID
         header['X-Lang'] = 'zh' //zh en
@@ -86,6 +87,8 @@ export async function request<T>(param: RequestParam): Promise<T> {
             reject('timeout');
         }, kTimeout);
 
+        console.log('post request',data)
+
         requestTask = Taro.request({
             url: url,
             method: method,

src/services/user.tsx

@@ -55,11 +55,16 @@ export const wxLogin = (code: string) => (dispatch: any) => {
     })
 }*/
 
-export const register = (name: string, email: string, password: string) => (dispatch: any) => {
-    request({
-        url: API_REGISTER, method: 'POST', data: { client_type: 'IOS', username: name, email: email, password: password }
-    }).then(res => {
-        dispatch(registerSuccess(res));
+export const register = (name: string, email: string, password: string) => {
+    return new Promise((resolve, reject) => {
+        request({
+            url: API_REGISTER, method: 'POST', data: { client_type: 'IOS', username: name, email: email, password: password }
+        }).then(res => {
+            resolve(res);
+            // dispatch(loginSuccess(res));
+        }).catch(e=>{
+            reject(e)
+        })
     })
 }
 

src/store/user.tsx

@@ -99,84 +99,3 @@ const userSlice = createSlice({
 export const { loginSuccess, registerSuccess, logoutSuccess, getInfoSuccess, updateSuccess, clearSuccess } = userSlice.actions;
 export default userSlice.reducer;
 
-
-// export const login = (username: string, password: string) => (dispatch: any) => {
-//     request({
-//         url: API_LOGIN, method: 'POST', data: { username, password }
-//     }).then(res => {
-//         dispatch(loginSuccess(res));
-//     })
-// }
-
-// export const wxLogin = createAsyncThunk('user/wxLogin', async (payload: { code: string, encryptedData: string,iv:string }, { dispatch }) => {
-//     console.log(payload.code)
-//     request({
-//         url: API_LOGIN, method: 'POST',
-//         data: {
-//             code: payload.code,
-//             type: 'WX_MP',
-//             app_version: '1',
-//             client_version: '1',
-//             client_type: 'WX_MP',
-//             extra: {
-//                 encryptedData: payload.encryptedData,
-//                 iv: payload.iv
-//             }
-//         }
-//     }).then(res => {
-//         dispatch(loginSuccess(res));
-//     })
-// });
-
-// /*
-// export const wxLogin = (code: string) => (dispatch: any) => {
-    
-//     request({
-//         url: API_LOGIN, method: 'POST', data: { code,type:'WX_MP',app_version:'1',client_version:'1',client_type:'WXP_MP' }
-//     }).then(res => {
-//         console.log(res);
-//         dispatch(loginSuccess(res));
-//     })
-// }*/
-
-// export const register = (name: string,email:string, password: string) => (dispatch: any) => {
-//     request({
-//         url: API_REGISTER, method: 'POST', data: { client_type:'IOS',username:name,email:email, password:password }
-//     }).then(res => {
-//         dispatch(registerSuccess(res));
-//     })
-// }
-
-// export const logout = () => (dispatch: any) => {
-//     request({
-//         url: API_LOGOUT, method: 'GET', data: {}
-//     }).then(res => {
-//         dispatch(logoutSuccess());
-//     })
-// }
-
-// export const clear = () => (dispatch: any) => {
-//     request({
-//         url: API_CLEAR_USER, method: 'POST', data: {}
-//     }).then(res => {
-//         dispatch(clearSuccess());
-//     })
-// }
-
-// export const getInfo = () => (dispatch: any) => {
-//     request({
-//         url: API_USER_INFO, method: 'GET', data: {}
-//     }).then(res => {
-//         dispatch(getInfoSuccess(res));
-//     })
-// }
-
-
-// export const update = () => (dispatch: any) => {
-//     request({
-//         url: API_USER_INFO, method: 'POST', data: {}
-//     }).then(res => {
-//         dispatch(updateSuccess(res));
-//     })
-// }
-