2020-1-capstone-design2 / 2016104137

Go to a project
Toggle navigation Toggle navigation pinning
김예미
d9538fc1 1 parent 84e6f057

modify database state alert part

Inline Side-by-side
Showing 3 changed files with 51 additions and 19 deletions
......@@ -62,6 +62,15 @@ public class LoadingActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_loading);
try {
socket = IO.socket("http://172.30.1.40:3000/");
socket.connect();
}catch(Exception e){
e.printStackTrace();
}
startLoading();
}
......@@ -74,25 +83,51 @@ public class LoadingActivity extends Activity {
dbHelper.open();
getPhoto();
alert("alert","photo");
Log.i("MYLOG", "DB HY Part:1/13");
getVideo();
alert("alert","video");
Log.i("MYLOG", "DB HY Part:2/13");
getAudio();
getCalendarInfo();;
alert("alert","audio");
Log.i("MYLOG", "DB HY Part:3/13");
getCalendarInfo();
alert("alert","calendar");
Log.i("MYLOG", "DB HY Part:4/13");
getNetworkInfo();
alert("alert","network");
Log.i("MYLOG", "DB HY Part:5/13");
getCallLog();
alert("alert","calllog");
Log.i("MYLOG", "DB YM Part:6/13");
getContact();
alert("alert","contact");
Log.i("MYLOG", "DB YM Part:7/13");
getSMSMessage();
alert("alert","sms");
Log.i("MYLOG", "DB YM Part:8/13");
getWIFI();
alert("alert","wifi");
Log.i("MYLOG", "DB YM Part:9/13");
getPhoneInfo();
alert("alert","phoneinfo");
Log.i("MYLOG", "DB YY Part:10/13");
getAccountInfo();
alert("alert","accountinfo");
Log.i("MYLOG", "DB YY Part:11/13");
getAppInfo();
alert("alert","appinfo");
Log.i("MYLOG", "DB YY Part:12/13");
getUsageStats();
alert("alert","usagestats");
Log.i("MYLOG", "DB YY Part:13/13");
dbHelper.close();
finish();
alert();
alert("end", "end");
}
}, 2000);
}
......@@ -643,18 +678,10 @@ public class LoadingActivity extends Activity {
}
public void alert(){
try {
socket = IO.socket("http://172.30.1.40:3000/");
socket.connect();
}catch(Exception e){
e.printStackTrace();
}
public void alert(String type, String message){
JsonObject alertJsonObject = new JsonObject();
alertJsonObject.addProperty("comment", "insert done");
alertJsonObject.addProperty("comment", message);
JSONObject jsonObject = null;
try{
......@@ -663,8 +690,7 @@ public class LoadingActivity extends Activity {
e.printStackTrace();
}
socket.emit("alert", jsonObject);
Log.d("LogTest", "alert()");
socket.emit(type, jsonObject);
}
......
......@@ -4,7 +4,7 @@ const path = require('path')
const fs = require('fs')
var exec = require('child_process').exec, child; //!!!! 2.
var io = require('socket.io').listen(3000);
var mysql = require('mysql');
//var mysql = require('mysql');
const connect_btn = document.getElementById("connect_btn");
......@@ -48,9 +48,6 @@ function apkInstall(){
cc.innerHTML="install apk";
cmd_exec = exec('adb -s '+device+' shell am start -n com.example.dataextraction/com.example.dataextraction.MainActivity',function(error, stdout, stderr){
cc.innerHTML="start app";
setTimeout(function(){
cc.innerHTML="extract data";
},10000);
})
});
cmd_install();
......@@ -110,10 +107,13 @@ function extractDB () {
//db insert done
io.on('connection', function(socket){
cc.innerHTML="database created !";
var instanceId = socket.id;
socket.on('alert', function(data){
cc.innerHTML = data.comment+" db created";
})
socket.on('end', function(data){
cc.innerHTML="all databases created !";
extractDB();
})
})
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
</component>
</project>
\ No newline at end of file