From 20a7900965d077a7448770ad75a1eac0958c2a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20=C3=87olako=C4=9Flu?= Date: Mon, 27 May 2019 14:30:21 +0300 Subject: [PATCH] master app done --- .../me/yigitcolakoglu/master_app/fan.png | Bin .../me/yigitcolakoglu/master_app/ips.json | 5 + .../yigitcolakoglu/master_app/userinfo.json | 12 + MyCity/ips.json | 5 + bus_stop/control_card/control_card.ino | 54 -- bus_stop/qr_reader/starter.php | 17 + master_app/.idea/compiler.xml | 16 + master_app/.idea/encodings.xml | 6 + .../Maven__com_hierynomus_sshj_0_27_0.xml | 13 + .../Maven__com_jcraft_jzlib_1_1_3.xml | 13 + .../Maven__net_i2p_crypto_eddsa_0_2_0.xml | 13 + ...__org_bouncycastle_bcpkix_jdk15on_1_60.xml | 13 + ...__org_bouncycastle_bcprov_jdk15on_1_60.xml | 13 + .../Maven__org_json_json_20180813.xml | 13 + .../Maven__org_slf4j_slf4j_api_1_7_7.xml | 13 + master_app/.idea/misc.xml | 13 + master_app/.idea/modules.xml | 8 + master_app/.idea/uiDesigner.xml | 124 +++++ master_app/.idea/vcs.xml | 6 + master_app/.idea/workspace.xml | 396 +++++++++++++++ master_app/nbactions.xml | 49 ++ .../master_app => master_app}/pom.xml | 5 + .../me/yigitcolakoglu/master_app/Main.java | 10 +- .../yigitcolakoglu/master_app/cameraForm.form | 90 ++-- .../yigitcolakoglu/master_app/cameraForm.java | 112 +++-- .../java/me/yigitcolakoglu/master_app/fan.png | Bin 0 -> 5943 bytes .../me/yigitcolakoglu/master_app/ips.json | 5 + .../master_app/managementForm.form | 250 ++++++++++ .../master_app/managementForm.java | 464 ++++++++++++++++++ .../yigitcolakoglu/master_app/userinfo.json | 12 + .../me/yigitcolakoglu/master_app/Main.class | Bin 0 -> 575 bytes .../master_app/cameraForm$1.class | Bin 0 -> 879 bytes .../master_app/cameraForm$2.class | Bin 0 -> 879 bytes .../master_app/cameraForm$3.class | Bin 0 -> 879 bytes .../master_app/cameraForm$4.class | Bin 0 -> 879 bytes .../master_app/cameraForm$5.class | Bin 0 -> 597 bytes .../master_app/cameraForm.class | Bin 0 -> 15907 bytes .../master_app/managementForm$1.class | Bin 0 -> 907 bytes .../master_app/managementForm$2.class | Bin 0 -> 907 bytes .../master_app/managementForm$3.class | Bin 0 -> 907 bytes .../master_app/managementForm$4.class | Bin 0 -> 907 bytes .../master_app/managementForm$5.class | Bin 0 -> 907 bytes .../master_app/managementForm$6.class | Bin 0 -> 907 bytes .../master_app/managementForm$7.class | Bin 0 -> 907 bytes .../master_app/managementForm$8.class | Bin 0 -> 907 bytes .../master_app/managementForm$9.class | Bin 0 -> 613 bytes .../master_app/managementForm.class | Bin 0 -> 14349 bytes master_app/target/master_app-1.0-SNAPSHOT.jar | Bin 0 -> 24367 bytes .../target/maven-archiver/pom.properties | 5 + .../compile/default-compile/createdFiles.lst | 17 + .../compile/default-compile/inputFiles.lst | 3 + .../default-testCompile/inputFiles.lst | 0 server_side/Chatbot/keywords.json | 25 - server_side/Chatbot/main.py | 121 ----- server_side/Chatbot/parser_test.py | 86 ---- server_side/Chatbot/predefined.json | 4 - server_side/Chatbot/train.py | 72 --- server_side/Chatbot/user_details.json | 3 - traffic_analyzer/.idea/misc.xml | 6 + traffic_analyzer/.idea/modules.xml | 8 + .../.idea/serialmonitor_settings.xml | 4 + traffic_analyzer/.idea/vcs.xml | 6 + traffic_analyzer/.idea/workspace.xml | 141 ++++++ traffic_analyzer/light_control/.idea/.name | 1 + traffic_analyzer/light_control/.idea/misc.xml | 7 + .../light_control/.idea/modules.xml | 8 + .../.idea/serialmonitor_settings.xml | 4 + traffic_analyzer/light_control/.idea/vcs.xml | 6 + .../light_control/.idea/workspace.xml | 200 ++++++++ .../light_control/light_control.ino | 190 +++++++ traffic_analyzer/sender.py | 28 +- 71 files changed, 2257 insertions(+), 438 deletions(-) rename {traffic_analyzer/master_app/src/main/java => MyCity/classes/production/main}/me/yigitcolakoglu/master_app/fan.png (100%) create mode 100644 MyCity/classes/production/main/me/yigitcolakoglu/master_app/ips.json create mode 100644 MyCity/classes/production/main/me/yigitcolakoglu/master_app/userinfo.json create mode 100644 MyCity/ips.json delete mode 100644 bus_stop/control_card/control_card.ino create mode 100644 bus_stop/qr_reader/starter.php create mode 100644 master_app/.idea/compiler.xml create mode 100644 master_app/.idea/encodings.xml create mode 100644 master_app/.idea/libraries/Maven__com_hierynomus_sshj_0_27_0.xml create mode 100644 master_app/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml create mode 100644 master_app/.idea/libraries/Maven__net_i2p_crypto_eddsa_0_2_0.xml create mode 100644 master_app/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml create mode 100644 master_app/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml create mode 100644 master_app/.idea/libraries/Maven__org_json_json_20180813.xml create mode 100644 master_app/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml create mode 100644 master_app/.idea/misc.xml create mode 100644 master_app/.idea/modules.xml create mode 100644 master_app/.idea/uiDesigner.xml create mode 100644 master_app/.idea/vcs.xml create mode 100644 master_app/.idea/workspace.xml create mode 100644 master_app/nbactions.xml rename {traffic_analyzer/master_app => master_app}/pom.xml (82%) rename {traffic_analyzer/master_app => master_app}/src/main/java/me/yigitcolakoglu/master_app/Main.java (73%) rename {traffic_analyzer/master_app => master_app}/src/main/java/me/yigitcolakoglu/master_app/cameraForm.form (75%) rename {traffic_analyzer/master_app => master_app}/src/main/java/me/yigitcolakoglu/master_app/cameraForm.java (78%) create mode 100644 master_app/src/main/java/me/yigitcolakoglu/master_app/fan.png create mode 100644 master_app/src/main/java/me/yigitcolakoglu/master_app/ips.json create mode 100644 master_app/src/main/java/me/yigitcolakoglu/master_app/managementForm.form create mode 100644 master_app/src/main/java/me/yigitcolakoglu/master_app/managementForm.java create mode 100644 master_app/src/main/java/me/yigitcolakoglu/master_app/userinfo.json create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/Main.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/cameraForm$1.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/cameraForm$2.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/cameraForm$3.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/cameraForm$4.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/cameraForm$5.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/cameraForm.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$1.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$2.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$3.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$4.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$5.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$6.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$7.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$8.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm$9.class create mode 100644 master_app/target/classes/me/yigitcolakoglu/master_app/managementForm.class create mode 100644 master_app/target/master_app-1.0-SNAPSHOT.jar create mode 100644 master_app/target/maven-archiver/pom.properties create mode 100644 master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 master_app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 master_app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst delete mode 100644 server_side/Chatbot/keywords.json delete mode 100644 server_side/Chatbot/main.py delete mode 100644 server_side/Chatbot/parser_test.py delete mode 100644 server_side/Chatbot/predefined.json delete mode 100644 server_side/Chatbot/train.py delete mode 100644 server_side/Chatbot/user_details.json create mode 100644 traffic_analyzer/.idea/misc.xml create mode 100644 traffic_analyzer/.idea/modules.xml create mode 100644 traffic_analyzer/.idea/serialmonitor_settings.xml create mode 100644 traffic_analyzer/.idea/vcs.xml create mode 100644 traffic_analyzer/.idea/workspace.xml create mode 100644 traffic_analyzer/light_control/.idea/.name create mode 100644 traffic_analyzer/light_control/.idea/misc.xml create mode 100644 traffic_analyzer/light_control/.idea/modules.xml create mode 100644 traffic_analyzer/light_control/.idea/serialmonitor_settings.xml create mode 100644 traffic_analyzer/light_control/.idea/vcs.xml create mode 100644 traffic_analyzer/light_control/.idea/workspace.xml create mode 100644 traffic_analyzer/light_control/light_control.ino diff --git a/traffic_analyzer/master_app/src/main/java/me/yigitcolakoglu/master_app/fan.png b/MyCity/classes/production/main/me/yigitcolakoglu/master_app/fan.png similarity index 100% rename from traffic_analyzer/master_app/src/main/java/me/yigitcolakoglu/master_app/fan.png rename to MyCity/classes/production/main/me/yigitcolakoglu/master_app/fan.png diff --git a/MyCity/classes/production/main/me/yigitcolakoglu/master_app/ips.json b/MyCity/classes/production/main/me/yigitcolakoglu/master_app/ips.json new file mode 100644 index 0000000..be4ac40 --- /dev/null +++ b/MyCity/classes/production/main/me/yigitcolakoglu/master_app/ips.json @@ -0,0 +1,5 @@ +{ + "qr": "127.0.0.3", + "intersection": "127.0.0.1", + "ambulance": "127.0.0.1" +} \ No newline at end of file diff --git a/MyCity/classes/production/main/me/yigitcolakoglu/master_app/userinfo.json b/MyCity/classes/production/main/me/yigitcolakoglu/master_app/userinfo.json new file mode 100644 index 0000000..19c4e71 --- /dev/null +++ b/MyCity/classes/production/main/me/yigitcolakoglu/master_app/userinfo.json @@ -0,0 +1,12 @@ +{ + "usernames": { + "qr": "admin", + "ambulance": "yigit", + "intersection": "admin" + }, + "passwords": { + "qr": "admin", + "ambulance": "Ygtclksbl1", + "intersection": "admin" + } +} \ No newline at end of file diff --git a/MyCity/ips.json b/MyCity/ips.json new file mode 100644 index 0000000..af65ec2 --- /dev/null +++ b/MyCity/ips.json @@ -0,0 +1,5 @@ +{ + "qr": "127.0.0.1", + "intersection": "127.0.0.1", + "ambulance": "127.0.0.1" +} \ No newline at end of file diff --git a/bus_stop/control_card/control_card.ino b/bus_stop/control_card/control_card.ino deleted file mode 100644 index 7761f9d..0000000 --- a/bus_stop/control_card/control_card.ino +++ /dev/null @@ -1,54 +0,0 @@ -int pins[] = {13,8,9,10,11,12}; -int light_pin = 0; - -void setup() { - - for(int i = 0; i<6; i++){ - pinMode(pins[i],OUTPUT); - } - -} - -void loop() { - while(Serial.read() != '/'){ - continue; - } - char prev = '!'; - char cur = '!'; - String data = ""; - while(Serial.read() != '/'){ - if(cur == '!' || prev != cur){ - prev = cur; - data += cur; - } - cur = Serial.read() - } - - for(int i = 0; i<2;i++){ - switch(data[i]){ - - case "g": - digitalWrite(pins[i*3],HIGH); - digitalWrite(pins[(i*2)+1],LOW); - digitalWrite(pins[(i*2)+2],LOW); - break; - - case "y": - digitalWrite(pins[i*3],LOW); - digitalWrite(pins[(i*2)+1],HIGH); - digitalWrite(pins[(i*2)+1],LOW); - break; - - case "r": - digitalWrite(pins[i*3],LOW); - digitalWrite(pins[(i*2)+1],LOW); - digitalWrite(pins[(i*2)+1],HIGH); - break; - - - } - } - - - -} diff --git a/bus_stop/qr_reader/starter.php b/bus_stop/qr_reader/starter.php new file mode 100644 index 0000000..f4577aa --- /dev/null +++ b/bus_stop/qr_reader/starter.php @@ -0,0 +1,17 @@ + /dev/null 2>&1 &"); +}else{ + echo " + + + + + + "; +} +?> \ No newline at end of file diff --git a/master_app/.idea/compiler.xml b/master_app/.idea/compiler.xml new file mode 100644 index 0000000..6232026 --- /dev/null +++ b/master_app/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/encodings.xml b/master_app/.idea/encodings.xml new file mode 100644 index 0000000..b26911b --- /dev/null +++ b/master_app/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__com_hierynomus_sshj_0_27_0.xml b/master_app/.idea/libraries/Maven__com_hierynomus_sshj_0_27_0.xml new file mode 100644 index 0000000..1d5aa46 --- /dev/null +++ b/master_app/.idea/libraries/Maven__com_hierynomus_sshj_0_27_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml b/master_app/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml new file mode 100644 index 0000000..897f365 --- /dev/null +++ b/master_app/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__net_i2p_crypto_eddsa_0_2_0.xml b/master_app/.idea/libraries/Maven__net_i2p_crypto_eddsa_0_2_0.xml new file mode 100644 index 0000000..2c74515 --- /dev/null +++ b/master_app/.idea/libraries/Maven__net_i2p_crypto_eddsa_0_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml b/master_app/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml new file mode 100644 index 0000000..3cc1493 --- /dev/null +++ b/master_app/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_60.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml b/master_app/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml new file mode 100644 index 0000000..f6ca3ad --- /dev/null +++ b/master_app/.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_60.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__org_json_json_20180813.xml b/master_app/.idea/libraries/Maven__org_json_json_20180813.xml new file mode 100644 index 0000000..01c0a2e --- /dev/null +++ b/master_app/.idea/libraries/Maven__org_json_json_20180813.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/master_app/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000..1e67260 --- /dev/null +++ b/master_app/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/misc.xml b/master_app/.idea/misc.xml new file mode 100644 index 0000000..2545dc7 --- /dev/null +++ b/master_app/.idea/misc.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/modules.xml b/master_app/.idea/modules.xml new file mode 100644 index 0000000..397eb52 --- /dev/null +++ b/master_app/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/uiDesigner.xml b/master_app/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/master_app/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/master_app/.idea/vcs.xml b/master_app/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/master_app/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/master_app/.idea/workspace.xml b/master_app/.idea/workspace.xml new file mode 100644 index 0000000..f9b9589 --- /dev/null +++ b/master_app/.idea/workspace.xml @@ -0,0 +1,396 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1558953924923 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/traffic_analyzer/light_control/.idea/.name b/traffic_analyzer/light_control/.idea/.name new file mode 100644 index 0000000..e998e5e --- /dev/null +++ b/traffic_analyzer/light_control/.idea/.name @@ -0,0 +1 @@ +untitled_0 \ No newline at end of file diff --git a/traffic_analyzer/light_control/.idea/misc.xml b/traffic_analyzer/light_control/.idea/misc.xml new file mode 100644 index 0000000..8822db8 --- /dev/null +++ b/traffic_analyzer/light_control/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/traffic_analyzer/light_control/.idea/modules.xml b/traffic_analyzer/light_control/.idea/modules.xml new file mode 100644 index 0000000..00a4dc4 --- /dev/null +++ b/traffic_analyzer/light_control/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/traffic_analyzer/light_control/.idea/serialmonitor_settings.xml b/traffic_analyzer/light_control/.idea/serialmonitor_settings.xml new file mode 100644 index 0000000..b45564e --- /dev/null +++ b/traffic_analyzer/light_control/.idea/serialmonitor_settings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/traffic_analyzer/light_control/.idea/vcs.xml b/traffic_analyzer/light_control/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/traffic_analyzer/light_control/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/traffic_analyzer/light_control/.idea/workspace.xml b/traffic_analyzer/light_control/.idea/workspace.xml new file mode 100644 index 0000000..b36b37b --- /dev/null +++ b/traffic_analyzer/light_control/.idea/workspace.xml @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +