2020-1-capstone-design2 / 2016104137

Go to a project
Toggle navigation Toggle navigation pinning
김예미
385a82f6 1 parent dd330c2c

modify alert()

Inline Side-by-side
Showing 2 changed files with 38 additions and 28 deletions
...@@ -32,6 +32,7 @@ import android.provider.ContactsContract; ...@@ -32,6 +32,7 @@ import android.provider.ContactsContract;
32 import android.provider.MediaStore; 32 import android.provider.MediaStore;
33 import android.provider.Telephony; 33 import android.provider.Telephony;
34 import android.telephony.TelephonyManager; 34 import android.telephony.TelephonyManager;
35 +import android.util.Log;
35 import android.widget.Toast; 36 import android.widget.Toast;
36 import java.net.InetAddress; 37 import java.net.InetAddress;
37 import java.text.DateFormat; 38 import java.text.DateFormat;
...@@ -42,10 +43,19 @@ import java.util.List; ...@@ -42,10 +43,19 @@ import java.util.List;
42 import androidx.core.content.ContextCompat; 43 import androidx.core.content.ContextCompat;
43 44
44 45
46 +import com.google.gson.JsonObject;
47 +
48 +import org.json.JSONException;
49 +import org.json.JSONObject;
50 +
51 +import io.socket.client.IO;
52 +import io.socket.client.Socket;
53 +
45 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; 54 import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
46 55
47 public class LoadingActivity extends Activity { 56 public class LoadingActivity extends Activity {
48 57
58 + private Socket socket;
49 DBHelper dbHelper; 59 DBHelper dbHelper;
50 60
51 @Override 61 @Override
...@@ -81,6 +91,8 @@ public class LoadingActivity extends Activity { ...@@ -81,6 +91,8 @@ public class LoadingActivity extends Activity {
81 91
82 dbHelper.close(); 92 dbHelper.close();
83 finish(); 93 finish();
94 +
95 + alert();
84 } 96 }
85 }, 2000); 97 }, 2000);
86 } 98 }
...@@ -630,4 +642,30 @@ public class LoadingActivity extends Activity { ...@@ -630,4 +642,30 @@ public class LoadingActivity extends Activity {
630 } 642 }
631 } 643 }
632 644
645 +
646 + public void alert(){
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 +
656 + JsonObject alertJsonObject = new JsonObject();
657 + alertJsonObject.addProperty("comment", "insert done");
658 + JSONObject jsonObject = null;
659 +
660 + try{
661 + jsonObject = new JSONObject(alertJsonObject.toString());
662 + }catch(JSONException e){
663 + e.printStackTrace();
664 + }
665 +
666 + socket.emit("alert", jsonObject);
667 + Log.d("LogTest", "alert()");
668 +
669 + }
670 +
633 } 671 }
......
...@@ -18,8 +18,6 @@ import io.socket.client.Socket; ...@@ -18,8 +18,6 @@ import io.socket.client.Socket;
18 18
19 public class MainActivity extends AppCompatActivity { 19 public class MainActivity extends AppCompatActivity {
20 20
21 - private Socket socket;
22 -
23 String[] permission_list = { 21 String[] permission_list = {
24 Manifest.permission.READ_EXTERNAL_STORAGE, 22 Manifest.permission.READ_EXTERNAL_STORAGE,
25 Manifest.permission.WRITE_EXTERNAL_STORAGE, 23 Manifest.permission.WRITE_EXTERNAL_STORAGE,
...@@ -55,8 +53,6 @@ public class MainActivity extends AppCompatActivity { ...@@ -55,8 +53,6 @@ public class MainActivity extends AppCompatActivity {
55 53
56 Intent intent = new Intent(this, LoadingActivity.class); 54 Intent intent = new Intent(this, LoadingActivity.class);
57 startActivity(intent); 55 startActivity(intent);
58 -
59 - alert();
60 } 56 }
61 57
62 public void checkPermission(){ 58 public void checkPermission(){
...@@ -75,28 +71,4 @@ public class MainActivity extends AppCompatActivity { ...@@ -75,28 +71,4 @@ public class MainActivity extends AppCompatActivity {
75 } 71 }
76 } 72 }
77 73
78 - public void alert(){
79 -
80 - try {
81 - socket = IO.socket("http://192.168.0.3:3000/");
82 - socket.connect();
83 -
84 - }catch(Exception e){
85 - e.printStackTrace();
86 - }
87 -
88 - JsonObject alertJsonObject = new JsonObject();
89 - alertJsonObject.addProperty("comment", "insert done");
90 - JSONObject jsonObject = null;
91 -
92 - try{
93 - jsonObject = new JSONObject(alertJsonObject.toString());
94 - }catch(JSONException e){
95 - e.printStackTrace();
96 - }
97 -
98 - socket.emit("alert", jsonObject);
99 - Log.d("LogTest", "alert()");
100 -
101 - }
102 } 74 }
......