김예미

modify database state alert part

...@@ -62,6 +62,15 @@ public class LoadingActivity extends Activity { ...@@ -62,6 +62,15 @@ public class LoadingActivity extends Activity {
62 protected void onCreate(Bundle savedInstanceState) { 62 protected void onCreate(Bundle savedInstanceState) {
63 super.onCreate(savedInstanceState); 63 super.onCreate(savedInstanceState);
64 setContentView(R.layout.activity_loading); 64 setContentView(R.layout.activity_loading);
65 +
66 + try {
67 + socket = IO.socket("http://172.30.1.40:3000/");
68 + socket.connect();
69 +
70 + }catch(Exception e){
71 + e.printStackTrace();
72 + }
73 +
65 startLoading(); 74 startLoading();
66 } 75 }
67 76
...@@ -74,25 +83,51 @@ public class LoadingActivity extends Activity { ...@@ -74,25 +83,51 @@ public class LoadingActivity extends Activity {
74 dbHelper.open(); 83 dbHelper.open();
75 84
76 getPhoto(); 85 getPhoto();
86 + alert("alert","photo");
87 + Log.i("MYLOG", "DB HY Part:1/13");
77 getVideo(); 88 getVideo();
89 + alert("alert","video");
90 + Log.i("MYLOG", "DB HY Part:2/13");
78 getAudio(); 91 getAudio();
79 - getCalendarInfo();; 92 + alert("alert","audio");
93 + Log.i("MYLOG", "DB HY Part:3/13");
94 + getCalendarInfo();
95 + alert("alert","calendar");
96 + Log.i("MYLOG", "DB HY Part:4/13");
80 getNetworkInfo(); 97 getNetworkInfo();
98 + alert("alert","network");
99 + Log.i("MYLOG", "DB HY Part:5/13");
81 100
82 getCallLog(); 101 getCallLog();
102 + alert("alert","calllog");
103 + Log.i("MYLOG", "DB YM Part:6/13");
83 getContact(); 104 getContact();
105 + alert("alert","contact");
106 + Log.i("MYLOG", "DB YM Part:7/13");
84 getSMSMessage(); 107 getSMSMessage();
108 + alert("alert","sms");
109 + Log.i("MYLOG", "DB YM Part:8/13");
85 getWIFI(); 110 getWIFI();
111 + alert("alert","wifi");
112 + Log.i("MYLOG", "DB YM Part:9/13");
86 113
87 getPhoneInfo(); 114 getPhoneInfo();
115 + alert("alert","phoneinfo");
116 + Log.i("MYLOG", "DB YY Part:10/13");
88 getAccountInfo(); 117 getAccountInfo();
118 + alert("alert","accountinfo");
119 + Log.i("MYLOG", "DB YY Part:11/13");
89 getAppInfo(); 120 getAppInfo();
121 + alert("alert","appinfo");
122 + Log.i("MYLOG", "DB YY Part:12/13");
90 getUsageStats(); 123 getUsageStats();
124 + alert("alert","usagestats");
125 + Log.i("MYLOG", "DB YY Part:13/13");
91 126
92 dbHelper.close(); 127 dbHelper.close();
93 finish(); 128 finish();
94 129
95 - alert(); 130 + alert("end", "end");
96 } 131 }
97 }, 2000); 132 }, 2000);
98 } 133 }
...@@ -643,18 +678,10 @@ public class LoadingActivity extends Activity { ...@@ -643,18 +678,10 @@ public class LoadingActivity extends Activity {
643 } 678 }
644 679
645 680
646 - public void alert(){ 681 + public void alert(String type, String message){
647 -
648 - try {
649 - socket = IO.socket("http://172.30.1.40:3000/");
650 - socket.connect();
651 -
652 - }catch(Exception e){
653 - e.printStackTrace();
654 - }
655 682
656 JsonObject alertJsonObject = new JsonObject(); 683 JsonObject alertJsonObject = new JsonObject();
657 - alertJsonObject.addProperty("comment", "insert done"); 684 + alertJsonObject.addProperty("comment", message);
658 JSONObject jsonObject = null; 685 JSONObject jsonObject = null;
659 686
660 try{ 687 try{
...@@ -663,8 +690,7 @@ public class LoadingActivity extends Activity { ...@@ -663,8 +690,7 @@ public class LoadingActivity extends Activity {
663 e.printStackTrace(); 690 e.printStackTrace();
664 } 691 }
665 692
666 - socket.emit("alert", jsonObject); 693 + socket.emit(type, jsonObject);
667 - Log.d("LogTest", "alert()");
668 694
669 } 695 }
670 696
......
...@@ -4,7 +4,7 @@ const path = require('path') ...@@ -4,7 +4,7 @@ const path = require('path')
4 const fs = require('fs') 4 const fs = require('fs')
5 var exec = require('child_process').exec, child; //!!!! 2. 5 var exec = require('child_process').exec, child; //!!!! 2.
6 var io = require('socket.io').listen(3000); 6 var io = require('socket.io').listen(3000);
7 -var mysql = require('mysql'); 7 +//var mysql = require('mysql');
8 8
9 9
10 const connect_btn = document.getElementById("connect_btn"); 10 const connect_btn = document.getElementById("connect_btn");
...@@ -48,9 +48,6 @@ function apkInstall(){ ...@@ -48,9 +48,6 @@ function apkInstall(){
48 cc.innerHTML="install apk"; 48 cc.innerHTML="install apk";
49 cmd_exec = exec('adb -s '+device+' shell am start -n com.example.dataextraction/com.example.dataextraction.MainActivity',function(error, stdout, stderr){ 49 cmd_exec = exec('adb -s '+device+' shell am start -n com.example.dataextraction/com.example.dataextraction.MainActivity',function(error, stdout, stderr){
50 cc.innerHTML="start app"; 50 cc.innerHTML="start app";
51 - setTimeout(function(){
52 - cc.innerHTML="extract data";
53 - },10000);
54 }) 51 })
55 }); 52 });
56 cmd_install(); 53 cmd_install();
...@@ -110,10 +107,13 @@ function extractDB () { ...@@ -110,10 +107,13 @@ function extractDB () {
110 107
111 //db insert done 108 //db insert done
112 io.on('connection', function(socket){ 109 io.on('connection', function(socket){
113 - cc.innerHTML="database created !";
114 var instanceId = socket.id; 110 var instanceId = socket.id;
115 111
116 socket.on('alert', function(data){ 112 socket.on('alert', function(data){
113 + cc.innerHTML = data.comment+" db created";
114 + })
115 + socket.on('end', function(data){
116 + cc.innerHTML="all databases created !";
117 extractDB(); 117 extractDB();
118 }) 118 })
119 }) 119 })
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project version="4">
3 + <component name="VcsDirectoryMappings">
4 + <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
5 + </component>
6 +</project>
...\ No newline at end of file ...\ No newline at end of file