Jelajahi Sumber

fixed zoom issue

Eric Li 2 tahun lalu
induk
melakukan
60aa449ce1

+ 1 - 1
.env

@@ -1,7 +1,7 @@
 SPOKESTACK_ID=c361ff3a-70c3-42e6-b0ee-0207edd03b18
 SPOKESTACK_TOKEN=1A8196594C401EB93035CC6D7D6328CF1855C2B359744E720953AC34B6F658CA
 
-API_URL=http://192.168.0.22
+API_URL=http://192.168.0.22:8000
 
 #API_URL=https://app.clicknpush.ca
 

+ 11 - 3
src/components/Map/MainMapComponent/IndoorMap.tsx

@@ -280,7 +280,7 @@ const IndoorMap: React.FC<IndoorMapProps> = ({ navigation, landmarks, promptAddL
 
       <StatusBar backgroundColor="#121212" />
       <CustomModal />
-      <Text style={{ fontSize: 16, marginBottom: 5 }}>Please select a floor you would like to go to.</Text>
+      {/* <Text style={{ fontSize: 16, marginBottom: 5 }}>Please select a floor you would like to go to.</Text> */}
 
       <View style={{ borderColor: "blue", borderWidth: 0, maxHeight: 50, flex: 1, flexDirection: "row", justifyContent: "center", }}>
 
@@ -317,8 +317,14 @@ const IndoorMap: React.FC<IndoorMapProps> = ({ navigation, landmarks, promptAddL
             </View> :
 
             <ReactNativeZoomableView
-              zoomStep={2.8}
+              
+              panBoundaryPadding={50}
+              // bindToBorders={false}
               bindToBorders={true}
+              
+              
+
+              zoomStep={2.8}
               // initialZoom={2.2}
               maxZoom={2.8}
               minZoom={1}
@@ -379,7 +385,9 @@ const IndoorMap: React.FC<IndoorMapProps> = ({ navigation, landmarks, promptAddL
                 })
                 console.log("*this is within onLayout* SVGdim values are " + SVGdim[0] + " AND " + SVGdim[1])
                 setLocalLandmarks(transformedLandmarks)
-              }}>
+              }}
+              style={{borderColor:"red" , borderWidth:0}}
+              >
 
                 {/* {firstTime == true ? undefined : loadCircles} */}
                 {loadCircles}

+ 2 - 1
src/navigation/AuthorizedNavigator.tsx

@@ -42,7 +42,8 @@ const tabBarOptions: BottomTabNavigationOptions = {
     tabBarActiveTintColor: 'white',
     tabBarActiveBackgroundColor: '#e35555',
     tabBarInactiveTintColor: "lightgray",
-    
+    headerShown:false,
+
     tabBarStyle: {backgroundColor: colors.red, height: 60, justifyContent: 'center'},
     tabBarLabelStyle: {marginBottom: 7},
     tabBarIconStyle: {marginBottom: 7}

+ 3 - 4
src/utils/RequestUtils.ts

@@ -27,8 +27,7 @@ import Config from 'react-native-config'
 //export const API_URL = 'http://192.168.3.81:8000'
 // export const API_URL = 'https://staging.clicknpush.ca'
 
-export const API_URL = 'http://192.168.3.162:8000'
-
-// export const API_URL = Config.API_URL
-
+// export const API_URL = 'http://192.168.3.162:8000'
+export const API_URL = 'http://192.168.0.22:8000'
 
+// export const API_URL = Config.API_URL