2021-1-capstone-design2 / 2017103957

Go to a project
Toggle navigation Toggle navigation pinning
김가영
d9c5014f 1 parent 637c2653

update

Inline Side-by-side
Showing 6 changed files with 209 additions and 103 deletions
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 </shared> 6 </shared>
7 </component> 7 </component>
8 <component name="AndroidLogFilters"> 8 <component name="AndroidLogFilters">
9 + <option name="TOOL_WINDOW_CUSTOM_FILTER" value="MYLOG" />
9 <option name="TOOL_WINDOW_LOG_LEVEL" value="info" /> 10 <option name="TOOL_WINDOW_LOG_LEVEL" value="info" />
10 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> 11 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
11 </component> 12 </component>
...@@ -15,6 +16,7 @@ ...@@ -15,6 +16,7 @@
15 <change beforePath="$PROJECT_DIR$/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/AndroidManifest.xml" afterDir="false" /> 16 <change beforePath="$PROJECT_DIR$/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/AndroidManifest.xml" afterDir="false" />
16 <change beforePath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" afterDir="false" /> 17 <change beforePath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" afterDir="false" />
17 <change beforePath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" afterDir="false" /> 18 <change beforePath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" afterDir="false" />
19 + <change beforePath="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" afterDir="false" />
18 </list> 20 </list>
19 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 21 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
20 <option name="SHOW_DIALOG" value="false" /> 22 <option name="SHOW_DIALOG" value="false" />
...@@ -25,7 +27,7 @@ ...@@ -25,7 +27,7 @@
25 <component name="DefaultGradleProjectSettings"> 27 <component name="DefaultGradleProjectSettings">
26 <option name="isMigrated" value="true" /> 28 <option name="isMigrated" value="true" />
27 </component> 29 </component>
28 - <component name="ExecutionTargetManager" SELECTED_TARGET="ce12160cc327c64005" /> 30 + <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_28" />
29 <component name="ExternalProjectsManager"> 31 <component name="ExternalProjectsManager">
30 <system id="GRADLE"> 32 <system id="GRADLE">
31 <state> 33 <state>
...@@ -62,12 +64,12 @@ ...@@ -62,12 +64,12 @@
62 </file> 64 </file>
63 <file pinned="false" current-in-tab="false"> 65 <file pinned="false" current-in-tab="false">
64 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml"> 66 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
65 - <provider editor-type-id="android-manifest" />
66 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
67 - <state relative-caret-position="-76"> 68 + <state relative-caret-position="76">
68 - <caret line="11" column="80" selection-start-line="11" selection-start-column="80" selection-end-line="11" selection-end-column="80" /> 69 + <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
69 </state> 70 </state>
70 </provider> 71 </provider>
72 + <provider editor-type-id="android-manifest" />
71 </entry> 73 </entry>
72 </file> 74 </file>
73 <file pinned="false" current-in-tab="false"> 75 <file pinned="false" current-in-tab="false">
...@@ -91,8 +93,8 @@ ...@@ -91,8 +93,8 @@
91 <file pinned="false" current-in-tab="false"> 93 <file pinned="false" current-in-tab="false">
92 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java"> 94 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
93 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
94 - <state relative-caret-position="366"> 96 + <state relative-caret-position="239">
95 - <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" /> 97 + <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
96 <folding> 98 <folding>
97 <element signature="imports" expanded="true" /> 99 <element signature="imports" expanded="true" />
98 </folding> 100 </folding>
...@@ -101,32 +103,34 @@ ...@@ -101,32 +103,34 @@
101 </entry> 103 </entry>
102 </file> 104 </file>
103 <file pinned="false" current-in-tab="true"> 105 <file pinned="false" current-in-tab="true">
104 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java"> 106 + <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml">
107 + <provider editor-type-id="android-designer2" />
105 <provider selected="true" editor-type-id="text-editor"> 108 <provider selected="true" editor-type-id="text-editor">
106 - <state relative-caret-position="209"> 109 + <state relative-caret-position="266">
107 - <caret line="184" column="53" lean-forward="true" selection-start-line="184" selection-start-column="53" selection-end-line="184" selection-end-column="53" /> 110 + <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
108 - <folding>
109 - <element signature="e#5574#8719#0" expanded="true" />
110 - <element signature="e#8718#8719#0" expanded="true" />
111 - </folding>
112 </state> 111 </state>
113 </provider> 112 </provider>
114 </entry> 113 </entry>
115 </file> 114 </file>
116 <file pinned="false" current-in-tab="false"> 115 <file pinned="false" current-in-tab="false">
117 - <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_main.xml"> 116 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
118 <provider selected="true" editor-type-id="text-editor"> 117 <provider selected="true" editor-type-id="text-editor">
119 - <state relative-caret-position="399"> 118 + <state relative-caret-position="-763">
120 - <caret line="21" selection-start-line="21" selection-end-line="21" /> 119 + <caret line="270" selection-start-line="270" selection-end-line="270" />
120 + <folding>
121 + <element signature="imports" expanded="true" />
122 + </folding>
121 </state> 123 </state>
122 </provider> 124 </provider>
123 - <provider editor-type-id="android-designer2" />
124 </entry> 125 </entry>
125 </file> 126 </file>
126 <file pinned="false" current-in-tab="false"> 127 <file pinned="false" current-in-tab="false">
127 - <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml"> 128 + <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/io/BufferedReader.java">
128 - <provider selected="true" editor-type-id="text-editor" /> 129 + <provider selected="true" editor-type-id="text-editor">
129 - <provider editor-type-id="android-designer2" /> 130 + <state relative-caret-position="127">
131 + <caret line="399" selection-start-line="399" selection-end-line="399" />
132 + </state>
133 + </provider>
130 </entry> 134 </entry>
131 </file> 135 </file>
132 </leaf> 136 </leaf>
...@@ -142,6 +146,10 @@ ...@@ -142,6 +146,10 @@
142 <findStrings> 146 <findStrings>
143 <find>tag</find> 147 <find>tag</find>
144 <find>alert</find> 148 <find>alert</find>
149 + <find>startLoading</find>
150 + <find>getPhoto</find>
151 + <find>sdca</find>
152 + <find>/mnt/sdcard</find>
145 </findStrings> 153 </findStrings>
146 </component> 154 </component>
147 <component name="Git.Settings"> 155 <component name="Git.Settings">
...@@ -153,9 +161,10 @@ ...@@ -153,9 +161,10 @@
153 <option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" /> 161 <option value="$PROJECT_DIR$/src/main/res/xml/network_security_config.xml" />
154 <option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" /> 162 <option value="$PROJECT_DIR$/src/main/res/layout/activity_main.xml" />
155 <option value="$PROJECT_DIR$/build.gradle" /> 163 <option value="$PROJECT_DIR$/build.gradle" />
164 + <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" />
156 <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" /> 165 <option value="$PROJECT_DIR$/src/main/AndroidManifest.xml" />
166 + <option value="$PROJECT_DIR$/src/main/res/layout/activity_loading.xml" />
157 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" /> 167 <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java" />
158 - <option value="$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java" />
159 </list> 168 </list>
160 </option> 169 </option>
161 </component> 170 </component>
...@@ -231,9 +240,9 @@ ...@@ -231,9 +240,9 @@
231 </option> 240 </option>
232 </component> 241 </component>
233 <component name="ProjectFrameBounds" extendedState="6"> 242 <component name="ProjectFrameBounds" extendedState="6">
234 - <option name="x" value="770" /> 243 + <option name="x" value="952" />
235 - <option name="width" value="1159" /> 244 + <option name="width" value="977" />
236 - <option name="height" value="1048" /> 245 + <option name="height" value="1038" />
237 </component> 246 </component>
238 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 247 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
239 <component name="ProjectView"> 248 <component name="ProjectView">
...@@ -241,24 +250,20 @@ ...@@ -241,24 +250,20 @@
241 <foldersAlwaysOnTop value="true" /> 250 <foldersAlwaysOnTop value="true" />
242 </navigator> 251 </navigator>
243 <panes> 252 <panes>
253 + <pane id="PackagesPane" />
254 + <pane id="ProjectPane" />
255 + <pane id="Scope" />
244 <pane id="AndroidView"> 256 <pane id="AndroidView">
245 <subPane> 257 <subPane>
246 <expand> 258 <expand>
247 <path> 259 <path>
248 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" /> 260 <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
249 - <item name="app" type="feadf853:AndroidModuleNode" />
250 - </path>
251 - <path>
252 - <item name="DataExtraction" type="1abcf292:AndroidViewProjectNode" />
253 <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" /> 261 <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
254 </path> 262 </path>
255 </expand> 263 </expand>
256 <select /> 264 <select />
257 </subPane> 265 </subPane>
258 </pane> 266 </pane>
259 - <pane id="PackagesPane" />
260 - <pane id="Scope" />
261 - <pane id="ProjectPane" />
262 </panes> 267 </panes>
263 </component> 268 </component>
264 <component name="PropertiesComponent"> 269 <component name="PropertiesComponent">
...@@ -369,7 +374,7 @@ ...@@ -369,7 +374,7 @@
369 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 374 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
370 <layout> 375 <layout>
371 <window_info id="Captures" order="0" side_tool="true" weight="0.25" /> 376 <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
372 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.020134227" /> 377 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.14899328" />
373 <window_info id="Structure" order="2" side_tool="true" /> 378 <window_info id="Structure" order="2" side_tool="true" />
374 <window_info id="Favorites" order="3" side_tool="true" /> 379 <window_info id="Favorites" order="3" side_tool="true" />
375 <window_info id="Build Variants" order="4" side_tool="true" /> 380 <window_info id="Build Variants" order="4" side_tool="true" />
...@@ -377,14 +382,14 @@ ...@@ -377,14 +382,14 @@
377 <window_info id="Designer" order="6" /> 382 <window_info id="Designer" order="6" />
378 <window_info id="Resources Explorer" order="7" /> 383 <window_info id="Resources Explorer" order="7" />
379 <window_info id="Capture Tool" order="8" /> 384 <window_info id="Capture Tool" order="8" />
380 - <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32907802" /> 385 + <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49932885" weight="0.32765958" />
381 - <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49798658" weight="0.32056737" /> 386 + <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.49654377" weight="0.32056737" />
382 <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" /> 387 <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49932885" weight="0.32907802" />
383 - <window_info anchor="bottom" id="Debug" order="3" /> 388 + <window_info anchor="bottom" id="Debug" order="3" weight="0.32907802" />
384 <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" /> 389 <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49932885" weight="0.32907802" />
385 - <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50201344" side_tool="true" weight="0.3219858" /> 390 + <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50345623" side_tool="true" weight="0.3186969" />
386 <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49932885" weight="0.32907802" /> 391 <window_info anchor="bottom" id="Version Control" order="6" sideWeight="0.49932885" weight="0.32907802" />
387 - <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.32907802" /> 392 + <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49932885" weight="0.3248227" />
388 <window_info anchor="bottom" id="Android Profiler" order="8" /> 393 <window_info anchor="bottom" id="Android Profiler" order="8" />
389 <window_info anchor="bottom" id="Find" order="9" /> 394 <window_info anchor="bottom" id="Find" order="9" />
390 <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.3295302" /> 395 <window_info anchor="right" id="Device File Explorer" order="0" sideWeight="0.6680761" side_tool="true" weight="0.3295302" />
...@@ -422,14 +427,26 @@ ...@@ -422,14 +427,26 @@
422 <window_info anchor="right" id="Palette&#9;" order="5" /> 427 <window_info anchor="right" id="Palette&#9;" order="5" />
423 </layout-to-restore> 428 </layout-to-restore>
424 </component> 429 </component>
430 + <component name="XDebuggerManager">
431 + <breakpoint-manager>
432 + <breakpoints>
433 + <line-breakpoint enabled="true" type="java-line">
434 + <url>file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java</url>
435 + <line>172</line>
436 + <properties />
437 + <option name="timeStamp" value="2" />
438 + </line-breakpoint>
439 + </breakpoints>
440 + </breakpoint-manager>
441 + </component>
425 <component name="editorHistoryManager"> 442 <component name="editorHistoryManager">
426 <entry file="file://$PROJECT_DIR$/src/main/res/xml/network_security_config.xml"> 443 <entry file="file://$PROJECT_DIR$/src/main/res/xml/network_security_config.xml">
444 + <provider editor-type-id="android-designer2" />
427 <provider selected="true" editor-type-id="text-editor"> 445 <provider selected="true" editor-type-id="text-editor">
428 <state relative-caret-position="76"> 446 <state relative-caret-position="76">
429 <caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" /> 447 <caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
430 </state> 448 </state>
431 </provider> 449 </provider>
432 - <provider editor-type-id="android-designer2" />
433 </entry> 450 </entry>
434 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/ContactDataBase.java"> 451 <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/ContactDataBase.java">
435 <provider selected="true" editor-type-id="text-editor"> 452 <provider selected="true" editor-type-id="text-editor">
...@@ -503,6 +520,15 @@ ...@@ -503,6 +520,15 @@
503 </state> 520 </state>
504 </provider> 521 </provider>
505 </entry> 522 </entry>
523 + <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/samsung-sm_g950n-ce12160cc327c64005/sdcard/TestLog/logfile.txt" />
524 + <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_main.xml">
525 + <provider editor-type-id="android-designer2" />
526 + <provider selected="true" editor-type-id="text-editor">
527 + <state relative-caret-position="399">
528 + <caret line="21" selection-start-line="21" selection-end-line="21" />
529 + </state>
530 + </provider>
531 + </entry>
506 <entry file="file://$PROJECT_DIR$/build.gradle"> 532 <entry file="file://$PROJECT_DIR$/build.gradle">
507 <provider selected="true" editor-type-id="text-editor"> 533 <provider selected="true" editor-type-id="text-editor">
508 <state relative-caret-position="513"> 534 <state relative-caret-position="513">
...@@ -524,47 +550,46 @@ ...@@ -524,47 +550,46 @@
524 </state> 550 </state>
525 </provider> 551 </provider>
526 </entry> 552 </entry>
527 - <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_main.xml"> 553 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
528 <provider selected="true" editor-type-id="text-editor"> 554 <provider selected="true" editor-type-id="text-editor">
529 - <state relative-caret-position="399"> 555 + <state relative-caret-position="239">
530 - <caret line="21" selection-start-line="21" selection-end-line="21" /> 556 + <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
557 + <folding>
558 + <element signature="imports" expanded="true" />
559 + </folding>
531 </state> 560 </state>
532 </provider> 561 </provider>
533 - <provider editor-type-id="android-designer2" />
534 </entry> 562 </entry>
535 - <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml"> 563 + <entry file="file://$USER_HOME$/AppData/Local/Android/Sdk/sources/android-28/java/io/BufferedReader.java">
536 - <provider selected="true" editor-type-id="text-editor" /> 564 + <provider selected="true" editor-type-id="text-editor">
537 - <provider editor-type-id="android-designer2" /> 565 + <state relative-caret-position="127">
566 + <caret line="399" selection-start-line="399" selection-end-line="399" />
567 + </state>
568 + </provider>
538 </entry> 569 </entry>
539 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml"> 570 <entry file="file://$PROJECT_DIR$/src/main/AndroidManifest.xml">
540 - <provider editor-type-id="android-manifest" />
541 <provider selected="true" editor-type-id="text-editor"> 571 <provider selected="true" editor-type-id="text-editor">
542 - <state relative-caret-position="-76"> 572 + <state relative-caret-position="76">
543 - <caret line="11" column="80" selection-start-line="11" selection-start-column="80" selection-end-line="11" selection-end-column="80" /> 573 + <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
544 </state> 574 </state>
545 </provider> 575 </provider>
576 + <provider editor-type-id="android-manifest" />
546 </entry> 577 </entry>
547 - <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/samsung-sm_g950n-ce12160cc327c64005/sdcard/TestLog/logfile.txt"> 578 + <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java">
548 - <provider selected="true" editor-type-id="text-editor" />
549 - </entry>
550 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/MainActivity.java">
551 <provider selected="true" editor-type-id="text-editor"> 579 <provider selected="true" editor-type-id="text-editor">
552 - <state relative-caret-position="366"> 580 + <state relative-caret-position="-763">
553 - <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" /> 581 + <caret line="270" selection-start-line="270" selection-end-line="270" />
554 <folding> 582 <folding>
555 <element signature="imports" expanded="true" /> 583 <element signature="imports" expanded="true" />
556 </folding> 584 </folding>
557 </state> 585 </state>
558 </provider> 586 </provider>
559 </entry> 587 </entry>
560 - <entry file="file://$PROJECT_DIR$/src/main/java/com/example/dataextraction/LoadingActivity.java"> 588 + <entry file="file://$PROJECT_DIR$/src/main/res/layout/activity_loading.xml">
589 + <provider editor-type-id="android-designer2" />
561 <provider selected="true" editor-type-id="text-editor"> 590 <provider selected="true" editor-type-id="text-editor">
562 - <state relative-caret-position="209"> 591 + <state relative-caret-position="266">
563 - <caret line="184" column="53" lean-forward="true" selection-start-line="184" selection-start-column="53" selection-end-line="184" selection-end-column="53" /> 592 + <caret line="14" column="44" lean-forward="true" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
564 - <folding>
565 - <element signature="e#5574#8719#0" expanded="true" />
566 - <element signature="e#8718#8719#0" expanded="true" />
567 - </folding>
568 </state> 593 </state>
569 </provider> 594 </provider>
570 </entry> 595 </entry>
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
31 <activity android:name=".LoadingActivity"> 31 <activity android:name=".LoadingActivity">
32 <intent-filter> 32 <intent-filter>
33 <action android:name="android.intent.action.MAIN" /> 33 <action android:name="android.intent.action.MAIN" />
34 -
35 <category android:name="android.intent.category.LAUNCHER" /> 34 <category android:name="android.intent.category.LAUNCHER" />
36 </intent-filter> 35 </intent-filter>
37 </activity> 36 </activity>
......
...@@ -31,6 +31,7 @@ import android.os.Build; ...@@ -31,6 +31,7 @@ import android.os.Build;
31 import android.os.Bundle; 31 import android.os.Bundle;
32 import android.os.Environment; 32 import android.os.Environment;
33 import android.os.Handler; 33 import android.os.Handler;
34 +import android.os.Message;
34 import android.provider.CalendarContract; 35 import android.provider.CalendarContract;
35 import android.provider.CallLog; 36 import android.provider.CallLog;
36 import android.provider.ContactsContract; 37 import android.provider.ContactsContract;
...@@ -39,14 +40,19 @@ import android.provider.Telephony; ...@@ -39,14 +40,19 @@ import android.provider.Telephony;
39 import android.provider.UserDictionary; 40 import android.provider.UserDictionary;
40 import android.telephony.TelephonyManager; 41 import android.telephony.TelephonyManager;
41 import android.util.Log; 42 import android.util.Log;
43 +import android.widget.ProgressBar;
42 import android.widget.Toast; 44 import android.widget.Toast;
43 45
44 import java.io.BufferedReader; 46 import java.io.BufferedReader;
45 import java.io.BufferedWriter; 47 import java.io.BufferedWriter;
46 import java.io.File; 48 import java.io.File;
49 +import java.io.FileInputStream;
50 +import java.io.FileNotFoundException;
47 import java.io.FileOutputStream; 51 import java.io.FileOutputStream;
48 import java.io.IOException; 52 import java.io.IOException;
53 +import java.io.InputStream;
49 import java.io.InputStreamReader; 54 import java.io.InputStreamReader;
55 +import java.io.OutputStream;
50 import java.io.OutputStreamWriter; 56 import java.io.OutputStreamWriter;
51 import java.net.InetAddress; 57 import java.net.InetAddress;
52 import java.text.DateFormat; 58 import java.text.DateFormat;
...@@ -74,6 +80,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; ...@@ -74,6 +80,7 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
74 public class LoadingActivity extends Activity { 80 public class LoadingActivity extends Activity {
75 81
76 private Socket socket; 82 private Socket socket;
83 + private ProgressBar bar;
77 DBHelper dbHelper; 84 DBHelper dbHelper;
78 85
79 String[] permission_list = { 86 String[] permission_list = {
...@@ -97,8 +104,7 @@ public class LoadingActivity extends Activity { ...@@ -97,8 +104,7 @@ public class LoadingActivity extends Activity {
97 protected void onCreate(Bundle savedInstanceState) { 104 protected void onCreate(Bundle savedInstanceState) {
98 super.onCreate(savedInstanceState); 105 super.onCreate(savedInstanceState);
99 setContentView(R.layout.activity_loading); 106 setContentView(R.layout.activity_loading);
100 - 107 + bar = (ProgressBar) findViewById(R.id.simpleProgressBar);
101 -
102 } 108 }
103 109
104 @Override 110 @Override
...@@ -154,8 +160,107 @@ public class LoadingActivity extends Activity { ...@@ -154,8 +160,107 @@ public class LoadingActivity extends Activity {
154 return false; 160 return false;
155 } 161 }
156 162
157 - public void makeTXT(String content){ 163 + public void makeFile(StringBuffer output, String filename) {
164 + try {
165 + String response = output.toString();
166 + Log.i("MYLOG", response);
167 +
168 + String foldername = "/mnt/sdcard/TempTEMP";
169 + Log.i("MYLOG", foldername);
170 + File dir = new File (foldername);
171 + //디렉토리 폴더가 없으면 생성함
172 + if(!dir.exists()){
173 + dir.mkdir();
174 + }
175 + //파일 output stream 생성
176 + FileOutputStream fos = new FileOutputStream(foldername+"/"+filename, true);
177 + //파일쓰기
178 + BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos));
179 + writer.write(response);
180 + writer.flush();
181 +
182 + writer.close();
183 + fos.close();
184 + } catch (IOException e) {
185 + e.printStackTrace();
186 + }
187 + }
188 +
189 + private void copyFile(String inputPath, String inputFile, String outputPath) {
158 190
191 + InputStream in = null;
192 + OutputStream out = null;
193 + try {
194 +
195 + //create output directory if it doesn't exist
196 + File dir = new File (outputPath);
197 + if (!dir.exists())
198 + {
199 + dir.mkdirs();
200 + }
201 +
202 + in = new FileInputStream(inputPath + inputFile);
203 + out = new FileOutputStream(outputPath + inputFile);
204 +
205 + byte[] buffer = new byte[1024];
206 + int read;
207 + while ((read = in.read(buffer)) != -1) {
208 + out.write(buffer, 0, read);
209 + }
210 + in.close();
211 + in = null;
212 +
213 + // write the output file (You have now copied the file)
214 + out.flush();
215 + out.close();
216 + out = null;
217 +
218 + } catch (FileNotFoundException fnfe1) {
219 + Log.e("tag", fnfe1.getMessage());
220 + }
221 + catch (Exception e) {
222 + Log.e("tag", e.getMessage());
223 + }
224 +
225 + }
226 +
227 + public void makeTXT(){
228 + try {
229 + StringBuffer output = new StringBuffer();
230 + StringBuffer output2 = new StringBuffer();
231 + StringBuffer output3 = new StringBuffer();
232 +
233 + Process uptime = Runtime.getRuntime().exec(new String[]{"uptime"}); // uptime
234 + uptime.waitFor();
235 + BufferedReader reader = new BufferedReader(new InputStreamReader(uptime.getInputStream()));
236 + String line = "";
237 + while((line = reader.readLine()) != null){
238 + output.append(line + "\n");
239 + }
240 + makeFile(output, "uptime.txt");
241 +
242 + Process df = Runtime.getRuntime().exec(new String[]{"df"}); // file system get --> USB 꽂힌 것 알아낼 수 있을듯..?
243 + df.waitFor();
244 + BufferedReader reader2 = new BufferedReader(new InputStreamReader(df.getInputStream()));
245 + String line2 = "";
246 + while((line2 = reader2.readLine()) != null){
247 + output2.append(line2 + "\n");
248 + }
249 + makeFile(output2, "df.txt");
250 +
251 + Process netstat = Runtime.getRuntime().exec(new String[]{"netstat"}); // network stat
252 + netstat.waitFor();
253 + BufferedReader reader3 = new BufferedReader(new InputStreamReader(netstat.getInputStream()));
254 + String line3 = "";
255 + while((line3 = reader3.readLine()) != null){
256 + output3.append(line3 + "\n");
257 + }
258 + makeFile(output3, "netstat.txt");
259 + } catch (IOException e) {
260 + e.printStackTrace();
261 + } catch (InterruptedException e) {
262 + e.printStackTrace();
263 + }
159 } 264 }
160 265
161 private void startLoading() { 266 private void startLoading() {
...@@ -163,48 +268,16 @@ public class LoadingActivity extends Activity { ...@@ -163,48 +268,16 @@ public class LoadingActivity extends Activity {
163 handler.postDelayed(new Runnable() { 268 handler.postDelayed(new Runnable() {
164 @Override 269 @Override
165 public void run() { 270 public void run() {
271 + makeTXT();
272 + copyFile("/mnt/sdcard/TempTEMP/", "df.txt", "/mnt/media_rw/5822-DED4/");
273 +
166 dbHelper = new DBHelper(getApplicationContext()); 274 dbHelper = new DBHelper(getApplicationContext());
167 dbHelper.open(); 275 dbHelper.open();
168 - try { 276 +
169 - StringBuffer output = new StringBuffer();
170 - Process df = Runtime.getRuntime().exec(new String[]{"df"}); // file system get --> USB 꽂힌 것 알아낼 수 있을듯..?
171 - Process netstat = Runtime.getRuntime().exec(new String[]{"netstat"}); // network stat
172 - Process p = Runtime.getRuntime().exec(new String[]{"uptime"}); // uptime
173 - p.waitFor();
174 - BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
175 - String line = "";
176 - while((line = reader.readLine()) != null){
177 - output.append(line + "\n");
178 - }
179 - String response = output.toString();
180 - Log.i("MYLOG", response);
181 -
182 - String foldername = "/sdcard"+"/TestLog";
183 - Log.i("MYLOG", foldername);
184 - String filename = "logfile.txt";
185 - File dir = new File (foldername);
186 - //디렉토리 폴더가 없으면 생성함
187 - if(!dir.exists()){
188 - dir.mkdir();
189 - }
190 - //파일 output stream 생성
191 - FileOutputStream fos = new FileOutputStream(foldername+"/"+filename, true);
192 - //파일쓰기
193 - BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos));
194 - writer.write(response);
195 - writer.flush();
196 -
197 - writer.close();
198 - fos.close();
199 -
200 - } catch (IOException e) {
201 - e.printStackTrace();
202 - } catch (InterruptedException e) {
203 - e.printStackTrace();
204 - }
205 getPhoto(); 277 getPhoto();
206 //alert("alert","photo"); 278 //alert("alert","photo");
207 Log.i("MYLOG", "DB HY Part:1/14"); 279 Log.i("MYLOG", "DB HY Part:1/14");
280 +
208 getVideo(); 281 getVideo();
209 //alert("alert","video"); 282 //alert("alert","video");
210 Log.i("MYLOG", "DB HY Part:2/14"); 283 Log.i("MYLOG", "DB HY Part:2/14");
...@@ -246,7 +319,6 @@ public class LoadingActivity extends Activity { ...@@ -246,7 +319,6 @@ public class LoadingActivity extends Activity {
246 getDocument(); 319 getDocument();
247 Log.i("MYLOG", "DB YY Part:14/14"); 320 Log.i("MYLOG", "DB YY Part:14/14");
248 dbHelper.close(); 321 dbHelper.close();
249 -
250 finish(); 322 finish();
251 startActivity(new Intent(LoadingActivity.this, MainActivity.class)); 323 startActivity(new Intent(LoadingActivity.this, MainActivity.class));
252 324
......
...@@ -2,10 +2,20 @@ ...@@ -2,10 +2,20 @@
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 + xmlns:tools="http://schemas.android.com/tools"
5 android:orientation="vertical"> 6 android:orientation="vertical">
6 <TextView 7 <TextView
7 android:id="@+id/textView" 8 android:id="@+id/textView"
8 android:layout_width="match_parent" 9 android:layout_width="match_parent"
9 android:layout_height="wrap_content" 10 android:layout_height="wrap_content"
10 android:text="CapstoneDesign2" /> 11 android:text="CapstoneDesign2" />
12 + <ProgressBar
13 + android:id="@+id/simpleProgressBar"
14 + android:layout_width="match_parent"
15 + android:layout_height="wrap_content"
16 + style="?android:attr/progressBarStyleHorizontal"
17 + android:max="100"
18 + tools:layout_editor_absoluteY="0dp"
19 + tools:layout_editor_absoluteX="8dp"
20 + android:visibility="visible"/>
11 </LinearLayout> 21 </LinearLayout>
...\ No newline at end of file ...\ No newline at end of file
......