2020-1-capstone-design1 / HCS_Project1

Go to a project
Toggle navigation Toggle navigation pinning
김성연
7e625935 1 parent 3990d56a

최종 보고서 수정 및 코드 수정

Inline Side-by-side
Showing 4 changed files with 27 additions and 63 deletions
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="VcsDirectoryMappings"> 3 <component name="VcsDirectoryMappings">
4 + <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
4 <mapping directory="$PROJECT_DIR$/locationTest/expo-location-example" vcs="Git" /> 5 <mapping directory="$PROJECT_DIR$/locationTest/expo-location-example" vcs="Git" />
5 <mapping directory="$PROJECT_DIR$/my-project" vcs="Git" /> 6 <mapping directory="$PROJECT_DIR$/my-project" vcs="Git" />
6 <mapping directory="$PROJECT_DIR$/render_server_react_native" vcs="Git" /> 7 <mapping directory="$PROJECT_DIR$/render_server_react_native" vcs="Git" />
......
...@@ -2,48 +2,9 @@ ...@@ -2,48 +2,9 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="940f1aa2-9848-4abc-bd75-a3db12d9e8e1" name="Default Changelist" comment=""> 4 <list default="true" id="940f1aa2-9848-4abc-bd75-a3db12d9e8e1" name="Default Changelist" comment="">
5 - <change afterPath="$PROJECT_DIR$/render_server_react_native/AppStyles.js" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
6 - <change afterPath="$PROJECT_DIR$/render_server_react_native/AuthContext.js" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7 - <change afterPath="$PROJECT_DIR$/render_server_react_native/assets/icons/Nike-Logo.html" afterDir="false" /> 7 + <change beforePath="$PROJECT_DIR$/../보고서/최종보고서.docx" beforeDir="false" afterPath="$PROJECT_DIR$/../보고서/최종보고서.docx" afterDir="false" />
8 - <change afterPath="$PROJECT_DIR$/render_server_react_native/assets/icons/google-marker.png" afterDir="false" />
9 - <change afterPath="$PROJECT_DIR$/render_server_react_native/assets/nike.png" afterDir="false" />
10 - <change afterPath="$PROJECT_DIR$/render_server_react_native/assets/search.html" afterDir="false" />
11 - <change afterPath="$PROJECT_DIR$/render_server_react_native/assets/userFile/file2.jpg" afterDir="false" />
12 - <change afterPath="$PROJECT_DIR$/render_server_react_native/assets/userFile/userVelocity.json" afterDir="false" />
13 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/BusPathComponent.js" afterDir="false" />
14 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/DateTimePickerComponent.js" afterDir="false" />
15 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/GoPathSummary.js" afterDir="false" />
16 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/LanePathComponent.js" afterDir="false" />
17 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/LoginComponent.js" afterDir="false" />
18 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/MyProfileComponent.js" afterDir="false" />
19 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/SignUpComponent.js" afterDir="false" />
20 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/StartAndFinishLocationComponent.js" afterDir="false" />
21 - <change afterPath="$PROJECT_DIR$/render_server_react_native/components/WalkPathComponent.js" afterDir="false" />
22 - <change afterPath="$PROJECT_DIR$/render_server_react_native/constants/layout.js" afterDir="false" />
23 - <change afterPath="$PROJECT_DIR$/render_server_react_native/navigations/SelectOrTakePhotoStackNavigation.js" afterDir="false" />
24 - <change afterPath="$PROJECT_DIR$/render_server_react_native/navigations/SelectOrTakePhotoTabNavigation.js" afterDir="false" />
25 - <change afterPath="$PROJECT_DIR$/render_server_react_native/navigations/SetLocationStackNavigation.js" afterDir="false" />
26 - <change afterPath="$PROJECT_DIR$/render_server_react_native/navigations/SetLocationTabNavigation.js" afterDir="false" />
27 - <change afterPath="$PROJECT_DIR$/render_server_react_native/navigations/TabNavigation.js" afterDir="false" />
28 - <change afterPath="$PROJECT_DIR$/render_server_react_native/reducers/index.js" afterDir="false" />
29 - <change afterPath="$PROJECT_DIR$/render_server_react_native/reducers/location.js" afterDir="false" />
30 - <change afterPath="$PROJECT_DIR$/render_server_react_native/reducers/user.js" afterDir="false" />
31 - <change afterPath="$PROJECT_DIR$/render_server_react_native/sagas/index.js" afterDir="false" />
32 - <change afterPath="$PROJECT_DIR$/render_server_react_native/sagas/location.js" afterDir="false" />
33 - <change afterPath="$PROJECT_DIR$/render_server_react_native/sagas/user.js" afterDir="false" />
34 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/Gallery.js" afterDir="false" />
35 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/GoPathDetail.js" afterDir="false" />
36 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/LocationTimeSet.js" afterDir="false" />
37 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/Login.js" afterDir="false" />
38 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/Main.js" afterDir="false" />
39 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/MainImage.js" afterDir="false" />
40 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/Maps.js" afterDir="false" />
41 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/OptRoutePath.js" afterDir="false" />
42 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/Profile.js" afterDir="false" />
43 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/SignUp.js" afterDir="false" />
44 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/TakePhoto.js" afterDir="false" />
45 - <change afterPath="$PROJECT_DIR$/render_server_react_native/screens/UploadPhoto.js" afterDir="false" />
46 - <change afterPath="$PROJECT_DIR$/render_server_react_native/store.js" afterDir="false" />
47 </list> 8 </list>
48 <option name="SHOW_DIALOG" value="false" /> 9 <option name="SHOW_DIALOG" value="false" />
49 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 10 <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -61,7 +22,7 @@ ...@@ -61,7 +22,7 @@
61 </option> 22 </option>
62 </component> 23 </component>
63 <component name="Git.Settings"> 24 <component name="Git.Settings">
64 - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/render_server_react_native" /> 25 + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
65 </component> 26 </component>
66 <component name="ProjectId" id="1baLVrrFUlmMeeq9EFLzndP0zML" /> 27 <component name="ProjectId" id="1baLVrrFUlmMeeq9EFLzndP0zML" />
67 <component name="ProjectLevelVcsManager" settingsEditedManually="true"> 28 <component name="ProjectLevelVcsManager" settingsEditedManually="true">
...@@ -164,6 +125,7 @@ ...@@ -164,6 +125,7 @@
164 <workItem from="1592536638207" duration="5384000" /> 125 <workItem from="1592536638207" duration="5384000" />
165 <workItem from="1592659198314" duration="162000" /> 126 <workItem from="1592659198314" duration="162000" />
166 <workItem from="1592659457606" duration="137000" /> 127 <workItem from="1592659457606" duration="137000" />
128 + <workItem from="1592813189933" duration="12000" />
167 </task> 129 </task>
168 <servers /> 130 <servers />
169 </component> 131 </component>
......
...@@ -16,26 +16,27 @@ const MyProfileComponent = () => { ...@@ -16,26 +16,27 @@ const MyProfileComponent = () => {
16 16
17 const {me} = useSelector(state => state.user); 17 const {me} = useSelector(state => state.user);
18 const {isLoggingIn} = useSelector(state => state.user); 18 const {isLoggingIn} = useSelector(state => state.user);
19 - // 19 +
20 - // const downloadFile = async () => { 20 + const downloadFile = async () => {
21 - // const uri = "https://www.mapmyfitness.com/workout/export/csv"; 21 + const uri = "https://www.mapmyfitness.com/workout/export/csv";
22 - // let fileUri = FileSystem.documentDirectory + "userVelocity.txt"; 22 + let fileUri = FileSystem.documentDirectory + "userVelocity.txt";
23 - // FileSystem.downloadAsync(uri, fileUri) 23 + FileSystem.downloadAsync(uri, fileUri)
24 - // .then(({uri}) => { 24 + .then(({uri}) => {
25 - // saveFile(uri); 25 + saveFile(uri);
26 - // }) 26 + })
27 - // .catch(error => { 27 + .catch(error => {
28 - // console.error(error); 28 + console.error(error);
29 - // }) 29 + })
30 - // } 30 + }
31 - // 31 +
32 - // const saveFile = async (fileUri) => { 32 + const saveFile = async (fileUri) => {
33 - // const {status} = await Permissions.askAsync(Permissions.CAMERA_ROLL); 33 + const {status} = await Permissions.askAsync(Permissions.CAMERA_ROLL);
34 - // if (status === "granted") { 34 + if (status === "granted") {
35 - // const asset = await MediaLibrary.createAssetAsync(fileUri) 35 + const asset = await MediaLibrary.createAssetAsync(fileUri)
36 - // await MediaLibrary.createAlbumAsync("Download", asset, false) 36 + await MediaLibrary.createAlbumAsync("Download", asset, false)
37 - // } 37 + }
38 - // } 38 + }
39 +
39 const dispatch = useDispatch(); 40 const dispatch = useDispatch();
40 const loadPersonalVelocity = async () => { 41 const loadPersonalVelocity = async () => {
41 try { 42 try {
......
This file is too large to display.