Skip to content

21_22-J 38
21_22-J 38
Commit b66bac08 authored by Lihinikaduwa D.N.R. 's avatar Lihinikaduwa D.N.R.
Browse files
Options

Merge branch

parents 935e189f a82d7ac4
Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 178 deletions
API/app.py
View file @ b66bac08
# import MySQLdb # import MySQLdb
from flask import Flask, render_template, request, jsonify, make_response
from API.model.color.colorModel import save_color_session_details, sendPredictData
from API.model.readModel import save_activity_details, save_session_details
from API.model.userModel import getUser, saveUserSession, logoutUser
from API.model.color.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result, storeResult, save_color_session_details
from flask import Flask, redirect, url_for, render_template, request, jsonify, make_response from flask import Flask, redirect, url_for, render_template, request, jsonify, make_response
import random import random
import os import os
from API.model.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result, \
save_color_session_details
from API.model.readModel import * from API.model.readModel import *
from API.model.userModel import * from API.model.userModel import *
from API.model.colorModel import get_color_activities1, get_color_activities2, get_color_activity_result, storeResult
from API.model.readModel import get_reading_activities from API.model.readModel import get_reading_activities
from API.routers.router import funtion_one from API.routers.router import funtion_one
...@@ -57,72 +60,31 @@ def predict(): ...@@ -57,72 +60,31 @@ def predict():
try: try:
data = request.get_json() data = request.get_json()
fileitem = data['uri'] audioFile = data['uri']
name = data['name']
colorName = data['colorNmae']
# print((f"{colorName}"))
# if fileitem.filename: response = sendPredictData(audioFile, name)
# # strip the leading path from the file name
fn = os.path.basename(fileitem)
#
# # open read and write the file into the server
# open(fn, 'wb').write(fileitem.file.read())
resp = make_response(request.get_json()) resp = make_response(request.get_json())
resp.headers['Access-Control-Allow-Origin'] = '*' resp.headers['Access-Control-Allow-Origin'] = '*'
resp.headers['Content-Type'] = 'application/json' resp.headers['Content-Type'] = 'application/json'
return resp return response
except ValueError: except ValueError:
print(ValueError) print(ValueError)
# get audio file and save it
# audio_file = request.files["file"]
# audio_file = request.files["name"]
# print((f"{request.data}"))
# print((f"{request.form}"))
# print((f"{request.values}"))
# print((f"{request.json}"))
# print(f"{request.form['name']}")
# file_name = str(random.randint(0, 100000))
# audio_file.save((file_name))
#
# # get file name
# predict_file_name = audio_file.filename
# predict_file_name = predict_file_name.split("/")
# new_predict_file_name = predict_file_name[1]
# new_predict_file_name = new_predict_file_name.split(".")
# FPFN = new_predict_file_name[0]
# # print(f"{FPFN}")
#
# # invoke keyword spotting service
# kss = Keyword_Spotting_service()
#
#
# # make a prediction
# predicted_keyword = kss.predict(file_name, FPFN)
#
# # remove the audio file
# os.remove(file_name)
#
# # send back the predicted keword in json format
# data = {"Keyword" : predicted_keyword}
# return jsonify("print")
# return "Print"
@app.route("/colorSession", methods=['POST']) @app.route("/colorSession", methods=['POST'])
def color_session(): def color_session():
req = request.get_json()
userId = req['userId'] token = save_color_session_details(1)
token = save_color_session_details(userId, 1) response = {
data = {
"token": token, "token": token,
"message": "Success", "message": "Success",
"status": 200 "status": 200
} }
body = jsonify(data) body = jsonify(response)
return make_response(body) return make_response(body)
...@@ -251,4 +213,4 @@ def get_completed_levels(userId): ...@@ -251,4 +213,4 @@ def get_completed_levels(userId):
if __name__ == "__main__": if __name__ == "__main__":
app.run(host='192.168.1.101') app.run(host='192.168.8.100')
API/db/dbConnection.py
View file @ b66bac08
...@@ -12,7 +12,7 @@ def create_con(): ...@@ -12,7 +12,7 @@ def create_con():
database="helply", database="helply",
host="127.0.0.1", host="127.0.0.1",
user="root", user="root",
password="12345678" password="rp19970520"
) )
return db return db
......
API/model/colorModel.py → API/model/color/colorModel.py
View file @ b66bac08
from flask import jsonify import os
import random
from flask import jsonify, Flask, request
from API.db.dbConnection import get_all_data, insert_data_json, insert_data, insert, get_data from API.db.dbConnection import get_all_data, insert_data_json, insert_data, insert, get_data
from API.model.color.keyword_spotting_service import Keyword_Spotting_service
from API.util.util import getUUID from API.util.util import getUUID
# get color activity 1 fun # get color activity 1 fun
...@@ -81,9 +84,48 @@ def get_color_activity_result(userId): ...@@ -81,9 +84,48 @@ def get_color_activity_result(userId):
return jsonify(data_dic) return jsonify(data_dic)
# store color activity session fun # store color activity session fun
def save_color_session_details(userId, status): def save_color_session_details(status):
token = getUUID() token = getUUID()
qry = 'INSERT INTO colorsession (id,userId,token,status) VALUES (NULL, %s, %s, %s)' qry = 'INSERT INTO colorsession (id,token,status) VALUES (NULL, %s, %s)'
args = (userId, token, status) args = (token, status)
insert(qry, args) insert(qry, args)
return token return token
\ No newline at end of file
#predict audio file
def sendPredictData(audioFile, name):
# print(f"{name}")
# path = "test/green.wav"
# print(f"{path}")
# audio_file = open(path, "rb")
# values = {
# "file": (path, audio_file, "audio/wav")
# }
# audio_file = values["file"]
# file_name = str(random.randint(0, 100000))
# audio_file.save((file_name))
# print(f"{path}")
# get file name
# predict_file_name = audio_file.filename
new_predict_file_name = name.split(".")
FPFN = new_predict_file_name[0]
# invoke keyword spotting service
kss = Keyword_Spotting_service()
# make a prediction
# predicted_keyword = kss.predict(file_name, FPFN)
# remove the audio file
# os.remove(file_name)
# send back the predicted keyword in json format
data = {"Predicted Keyword": FPFN}
print(f"data: {data}")
return jsonify(data)
\ No newline at end of file
API/model/color/keyword_spotting_service.py 0 → 100644
View file @ b66bac08
import tensorflow.keras as keras
import numpy as np
import librosa
MODEL_PATH = "model.h5"
NUM_SAMPLES_TO_CONSIDER = 22050 # 1 sec
class _Keyword_Spotting_Service:
model = None
_mappings = [
"black",
"blue",
"green",
"red",
"white",
"yellow"
]
_instance = None
# 78293
def predict(self, file_path, FPFN):
print(f"{file_path}")
# extract MFCCs
MFCCs = self.preprocess(file_path) # (# segment, # coefficients)
# convert 2d MFCCs array into 4d array -> (# samples, # segment, # coefficients, # channels)
MFCCs = MFCCs[np.newaxis, ..., np.newaxis]
# make prediction
predictions = self.model.predict(MFCCs)
predicted_index = np.argmax(predictions)
predicted_keyword = self._mappings[predicted_index]
# return predicted_keyword
if predicted_keyword == FPFN:
return predicted_keyword
else:
return "No Prediction"
def preprocess(self, file_path, n_mfcc=13, n_fft=2048, hop_length=512):
# load audio file
signal, sr = librosa.load(file_path)
# ensure consistency in the audio file length
if len(signal) > NUM_SAMPLES_TO_CONSIDER:
signal = signal[:NUM_SAMPLES_TO_CONSIDER]
# extract MFCCs
MFCCs = librosa.feature.mfcc(signal, n_mfcc=n_mfcc, n_fft=n_fft, hop_length=hop_length)
return MFCCs.T
def Keyword_Spotting_service():
# ensure that we only have 1 instance of KSS
if _Keyword_Spotting_Service._instance is None:
_Keyword_Spotting_Service._instance = _Keyword_Spotting_Service()
_Keyword_Spotting_Service.model = keras.models.load_model(MODEL_PATH)
return _Keyword_Spotting_Service._instance
if __name__ == "__main__":
kss = Keyword_Spotting_service()
keyword1 = kss.predict("test/black.wav")
keyword2 = kss.predict("test/blue.wav")
keyword3 = kss.predict("test/green.wav")
keyword4 = kss.predict("test/red.wav")
keyword5 = kss.predict("test/white.wav")
keyword6 = kss.predict("test/yellow.wav")
keyword7 = kss.predict("test/other.wav")
print(f"Predicted Keywords: {keyword1}")
print(f"Predicted Keywords: {keyword2}")
print(f"Predicted Keywords: {keyword3}")
print(f"Predicted Keywords: {keyword4}")
print(f"Predicted Keywords: {keyword5}")
print(f"Predicted Keywords: {keyword6}")
print(f"Predicted Keywords: {keyword7}")
\ No newline at end of file
frontend/package-lock.json
View file @ b66bac08
{ {
"name": "firstapp", "name": "firstapp",
"version": "0.0.1", "version": "0.0.1",
"lockfileVersion": 1, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
...@@ -18387,7 +18387,8 @@ ...@@ -18387,7 +18387,8 @@
"version": "22.4.1", "version": "22.4.1",
"resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.4.1.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.4.1.tgz",
"integrity": "sha512-gcLfn6P2PrFAVx3AobaOzlIEevpAEf9chTpFZz7bYfc7pz8XRv7vuKTIE4hxPKZSha6XWKKplDQ0x9Pq8xX2mg==", "integrity": "sha512-gcLfn6P2PrFAVx3AobaOzlIEevpAEf9chTpFZz7bYfc7pz8XRv7vuKTIE4hxPKZSha6XWKKplDQ0x9Pq8xX2mg==",
"dev": true "dev": true,
"requires": {}
}, },
"eslint-plugin-prettier": { "eslint-plugin-prettier": {
"version": "3.1.2", "version": "3.1.2",
...@@ -18436,7 +18437,8 @@ ...@@ -18436,7 +18437,8 @@
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz",
"integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==", "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
"dev": true "dev": true,
"requires": {}
}, },
"eslint-plugin-react-native": { "eslint-plugin-react-native": {
"version": "3.11.0", "version": "3.11.0",
...@@ -18477,7 +18479,8 @@ ...@@ -18477,7 +18479,8 @@
"@react-native-community/netinfo": { "@react-native-community/netinfo": {
"version": "7.1.12", "version": "7.1.12",
"resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-7.1.12.tgz", "resolved": "https://registry.npmjs.org/@react-native-community/netinfo/-/netinfo-7.1.12.tgz",
"integrity": "sha512-fkCRkOgzfdD0sr8JTasDgm716l8bJPkCNjXIyllG8K+UyixVa68lroQmgW9pewE5G5p43I9MWPtGZR/kVowBzg==" "integrity": "sha512-fkCRkOgzfdD0sr8JTasDgm716l8bJPkCNjXIyllG8K+UyixVa68lroQmgW9pewE5G5p43I9MWPtGZR/kVowBzg==",
"requires": {}
}, },
"@react-native-voice/voice": { "@react-native-voice/voice": {
"version": "3.2.3", "version": "3.2.3",
...@@ -18540,7 +18543,8 @@ ...@@ -18540,7 +18543,8 @@
"@react-navigation/elements": { "@react-navigation/elements": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz", "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.2.1.tgz",
"integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==" "integrity": "sha512-EnmAbKMsptrliRKf95rdgS6BhMjML+mIns06+G1Vdih6BrEo7/0iytThUv3WBf99AI76dyEq/cqLUwHPiFzXWg==",
"requires": {}
}, },
"@react-navigation/native": { "@react-navigation/native": {
"version": "6.0.6", "version": "6.0.6",
...@@ -18829,7 +18833,8 @@ ...@@ -18829,7 +18833,8 @@
"@react-types/shared": { "@react-types/shared": {
"version": "3.9.0", "version": "3.9.0",
"resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.9.0.tgz", "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.9.0.tgz",
"integrity": "sha512-YYksINfR6q92P10AhPEGo47Hd7oz1hrnZ6Vx8Gsrq62IbqDdv1XOTzPBaj17Z1ymNY2pitLUSEXsLmozt4wxxQ==" "integrity": "sha512-YYksINfR6q92P10AhPEGo47Hd7oz1hrnZ6Vx8Gsrq62IbqDdv1XOTzPBaj17Z1ymNY2pitLUSEXsLmozt4wxxQ==",
"requires": {}
}, },
"@react-types/slider": { "@react-types/slider": {
"version": "3.0.2", "version": "3.0.2",
...@@ -19198,7 +19203,8 @@ ...@@ -19198,7 +19203,8 @@
"version": "5.3.2", "version": "5.3.2",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
"integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
"dev": true "dev": true,
"requires": {}
}, },
"acorn-walk": { "acorn-walk": {
"version": "7.2.0", "version": "7.2.0",
...@@ -19429,7 +19435,8 @@ ...@@ -19429,7 +19435,8 @@
"babel-core": { "babel-core": {
"version": "7.0.0-bridge.0", "version": "7.0.0-bridge.0",
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
"integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==" "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
"requires": {}
}, },
"babel-jest": { "babel-jest": {
"version": "26.6.3", "version": "26.6.3",
...@@ -19666,6 +19673,12 @@ ...@@ -19666,6 +19673,12 @@
"resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz", "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.50.tgz",
"integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ==" "integrity": "sha512-+O2uoQWFRo8ysZNo/rjtri2jIwjr3XfeAgRjAUADRqGG+ZITvyn8J1kvXLTaKVr3hhGXk+f23tKfdzmklVM9vQ=="
}, },
"boolbase": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
"peer": true
},
"bplist-creator": { "bplist-creator": {
"version": "0.1.0", "version": "0.1.0",
"resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz", "resolved": "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz",
...@@ -20217,6 +20230,43 @@ ...@@ -20217,6 +20230,43 @@
"which": "^2.0.1" "which": "^2.0.1"
} }
}, },
"css-select": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
"integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
"peer": true,
"requires": {
"boolbase": "^1.0.0",
"css-what": "^6.0.1",
"domhandler": "^4.3.1",
"domutils": "^2.8.0",
"nth-check": "^2.0.1"
}
},
"css-tree": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
"peer": true,
"requires": {
"mdn-data": "2.0.14",
"source-map": "^0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"peer": true
}
}
},
"css-what": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
"peer": true
},
"cssom": { "cssom": {
"version": "0.4.4", "version": "0.4.4",
"resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
...@@ -20371,6 +20421,23 @@ ...@@ -20371,6 +20421,23 @@
"@babel/runtime": "^7.1.2" "@babel/runtime": "^7.1.2"
} }
}, },
"dom-serializer": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
"integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
"peer": true,
"requires": {
"domelementtype": "^2.0.1",
"domhandler": "^4.2.0",
"entities": "^2.0.0"
}
},
"domelementtype": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
"integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
"peer": true
},
"domexception": { "domexception": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
...@@ -20388,6 +20455,26 @@ ...@@ -20388,6 +20455,26 @@
} }
} }
}, },
"domhandler": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
"integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
"peer": true,
"requires": {
"domelementtype": "^2.2.0"
}
},
"domutils": {
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
"integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
"peer": true,
"requires": {
"dom-serializer": "^1.0.1",
"domelementtype": "^2.2.0",
"domhandler": "^4.2.0"
}
},
"ee-first": { "ee-first": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
...@@ -20432,6 +20519,12 @@ ...@@ -20432,6 +20519,12 @@
"ansi-colors": "^4.1.1" "ansi-colors": "^4.1.1"
} }
}, },
"entities": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
"peer": true
},
"envinfo": { "envinfo": {
"version": "7.8.1", "version": "7.8.1",
"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
...@@ -22618,7 +22711,8 @@ ...@@ -22618,7 +22711,8 @@
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
"integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
"dev": true "dev": true,
"requires": {}
}, },
"jest-regex-util": { "jest-regex-util": {
"version": "26.0.0", "version": "26.0.0",
...@@ -24530,6 +24624,15 @@ ...@@ -24530,6 +24624,15 @@
"path-key": "^3.0.0" "path-key": "^3.0.0"
} }
}, },
"nth-check": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
"peer": true,
"requires": {
"boolbase": "^1.0.0"
}
},
"nullthrows": { "nullthrows": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
...@@ -25086,7 +25189,8 @@ ...@@ -25086,7 +25189,8 @@
"react-freeze": { "react-freeze": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz", "resolved": "https://registry.npmjs.org/react-freeze/-/react-freeze-1.0.0.tgz",
"integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==" "integrity": "sha512-yQaiOqDmoKqks56LN9MTgY06O0qQHgV4FUrikH357DydArSZHQhl0BJFqGKIZoTqi8JizF9Dxhuk1FIZD6qCaw==",
"requires": {}
}, },
"react-is": { "react-is": {
"version": "17.0.2", "version": "17.0.2",
...@@ -25167,7 +25271,8 @@ ...@@ -25167,7 +25271,8 @@
"react-native-countdown-circle-timer": { "react-native-countdown-circle-timer": {
"version": "3.0.9", "version": "3.0.9",
"resolved": "https://registry.npmjs.org/react-native-countdown-circle-timer/-/react-native-countdown-circle-timer-3.0.9.tgz", "resolved": "https://registry.npmjs.org/react-native-countdown-circle-timer/-/react-native-countdown-circle-timer-3.0.9.tgz",
"integrity": "sha512-7djFk+2QQS9FAhfIUhwQoc+P/7Vkn9EJApr6zUWK9B5QvHP07UlqIWfhIPqqeMa4kP6y5Y2S3YL+xeRsq2tNfg==" "integrity": "sha512-7djFk+2QQS9FAhfIUhwQoc+P/7Vkn9EJApr6zUWK9B5QvHP07UlqIWfhIPqqeMa4kP6y5Y2S3YL+xeRsq2tNfg==",
"requires": {}
}, },
"react-native-countdown-component": { "react-native-countdown-component": {
"version": "2.7.1", "version": "2.7.1",
...@@ -25221,12 +25326,14 @@ ...@@ -25221,12 +25326,14 @@
"react-native-orientation-locker": { "react-native-orientation-locker": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/react-native-orientation-locker/-/react-native-orientation-locker-1.4.0.tgz", "resolved": "https://registry.npmjs.org/react-native-orientation-locker/-/react-native-orientation-locker-1.4.0.tgz",
"integrity": "sha512-O/Ki7uw1lltKiTZLcTuLcSh4EzLFqXKKo2J4cLKvyG52YiEawbn/ipsZriZlWzK0mhX4dSe79CoRS4IsyUs1fw==" "integrity": "sha512-O/Ki7uw1lltKiTZLcTuLcSh4EzLFqXKKo2J4cLKvyG52YiEawbn/ipsZriZlWzK0mhX4dSe79CoRS4IsyUs1fw==",
"requires": {}
}, },
"react-native-permissions": { "react-native-permissions": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-3.2.0.tgz", "resolved": "https://registry.npmjs.org/react-native-permissions/-/react-native-permissions-3.2.0.tgz",
"integrity": "sha512-UPXxf2twjYL9vPI4HP2kT15AOTY489MhsNuyAgp+wJM2IRkkSVW6rO3k4WuSRL9ZmPhwkWb9bYjf8EEwRzZcXg==" "integrity": "sha512-UPXxf2twjYL9vPI4HP2kT15AOTY489MhsNuyAgp+wJM2IRkkSVW6rO3k4WuSRL9ZmPhwkWb9bYjf8EEwRzZcXg==",
"requires": {}
}, },
"react-native-ratings": { "react-native-ratings": {
"version": "8.0.4", "version": "8.0.4",
...@@ -25250,7 +25357,8 @@ ...@@ -25250,7 +25357,8 @@
"react-native-safe-area-context": { "react-native-safe-area-context": {
"version": "3.3.2", "version": "3.3.2",
"resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz", "resolved": "https://registry.npmjs.org/react-native-safe-area-context/-/react-native-safe-area-context-3.3.2.tgz",
"integrity": "sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q==" "integrity": "sha512-yOwiiPJ1rk+/nfK13eafbpW6sKW0jOnsRem2C1LPJjM3tfTof6hlvV5eWHATye3XOpu2cJ7N+HdkUvUDGwFD2Q==",
"requires": {}
}, },
"react-native-screens": { "react-native-screens": {
"version": "3.9.0", "version": "3.9.0",
...@@ -25264,7 +25372,18 @@ ...@@ -25264,7 +25372,18 @@
"react-native-size-matters": { "react-native-size-matters": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.3.1.tgz", "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.3.1.tgz",
"integrity": "sha512-mKOfBLIBFBcs9br1rlZDvxD5+mAl8Gfr5CounwJtxI6Z82rGrMO+Kgl9EIg3RMVf3G855a85YVqHJL2f5EDRlw==" "integrity": "sha512-mKOfBLIBFBcs9br1rlZDvxD5+mAl8Gfr5CounwJtxI6Z82rGrMO+Kgl9EIg3RMVf3G855a85YVqHJL2f5EDRlw==",
"requires": {}
},
"react-native-svg": {
"version": "12.3.0",
"resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-12.3.0.tgz",
"integrity": "sha512-ESG1g1j7/WLD7X3XRFTQHVv0r6DpbHNNcdusngAODIxG88wpTWUZkhcM3A2HJTb+BbXTFDamHv7FwtRKWQ/ALg==",
"peer": true,
"requires": {
"css-select": "^4.2.1",
"css-tree": "^1.0.0-alpha.39"
}
}, },
"react-native-table-component": { "react-native-table-component": {
"version": "1.2.2", "version": "1.2.2",
...@@ -26509,6 +26628,14 @@ ...@@ -26509,6 +26628,14 @@
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
}, },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
},
"string-hash-64": { "string-hash-64": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz", "resolved": "https://registry.npmjs.org/string-hash-64/-/string-hash-64-1.0.3.tgz",
...@@ -26588,14 +26715,6 @@ ...@@ -26588,14 +26715,6 @@
"define-properties": "^1.1.3" "define-properties": "^1.1.3"
} }
}, },
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
},
"strip-ansi": { "strip-ansi": {
"version": "6.0.1", "version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
...@@ -27282,7 +27401,8 @@ ...@@ -27282,7 +27401,8 @@
"ws": { "ws": {
"version": "7.5.5", "version": "7.5.5",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
"integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==" "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
"requires": {}
}, },
"xcode": { "xcode": {
"version": "2.1.0", "version": "2.1.0",
frontend/src/router/router.js
View file @ b66bac08
...@@ -42,6 +42,7 @@ import GameScreenSixAll from '../screen/memory/elementry/GameScreenSixAll'; ...@@ -42,6 +42,7 @@ import GameScreenSixAll from '../screen/memory/elementry/GameScreenSixAll';
import GameOverScreen from '../screen/memory/GameOverScreen'; import GameOverScreen from '../screen/memory/GameOverScreen';
import Sam from '../screen/sample/sam'; import Sam from '../screen/sample/sam';
import Progress from '../screen/Progress';
const Stack = createNativeStackNavigator(); const Stack = createNativeStackNavigator();
...@@ -261,6 +262,11 @@ const AppRouter = () => { ...@@ -261,6 +262,11 @@ const AppRouter = () => {
name="Sam" name="Sam"
component={Sam} component={Sam}
/> />
<Stack.Screen
options={{headerShown: false}}
name="Progress"
component={Progress}
/>
</Stack.Navigator> </Stack.Navigator>
</NavigationContainer> </NavigationContainer>
); );
......
frontend/src/screen/Color.js
View file @ b66bac08
...@@ -17,6 +17,7 @@ export default function Color(props) { ...@@ -17,6 +17,7 @@ export default function Color(props) {
React.useEffect(() => { React.useEffect(() => {
setType(props.route.params.type); setType(props.route.params.type);
// AsyncStorage.removeItem('colorToken');
// const type2 = props.route.params.type2; // const type2 = props.route.params.type2;
...@@ -31,35 +32,50 @@ export default function Color(props) { ...@@ -31,35 +32,50 @@ export default function Color(props) {
return unsubscribe; return unsubscribe;
}, [navigation]); }, [navigation]);
const checkColorSession = () => {
AsyncStorage.getItem('colorToken')
.then(value => {
if (value == null) {
console.log('colorToken', value);
getColorSession(value);
} else {
console.log(value);
console.log('colorToken');
navigation.navigate("PrimaryType", { title: 'Primary Activities', id: 1 })
}
})
.catch(error => {
console.log(error);
});
};
const getColorSession = () => { const getColorSession = () => {
const data = {
userId: 1, client.post('colorSession', {
}; headers: {
client.post('colorSession', JSON.stringify(data), { Accept: 'application/json',
headers: { 'Content-Type': 'application/json',
Accept: 'application/json', },
'Content-Type': 'application/json',
},
}) })
.then(res => { .then(res => {
console.log(res.data); console.log(res.data);
if (res.status == 200) { if (res.status == 200) {
// console.log(res.data); // console.log(res.data);
const colorToken = res.data.token; const colorToken = res.data.token;
try { try {
AsyncStorage.setItem('colorToken', colorToken); AsyncStorage.setItem('colorToken', colorToken);
console.log(colorToken) // console.log(colorToken)
} catch (error) { } catch (error) {
console.log(error);
}
navigation.navigate("PrimaryType", { title: 'Primary Activities', id: 1 })
}
})
.catch(error => {
console.log(error); console.log(error);
} });
};
navigation.navigate("PrimaryType", { title: 'Primary Activities', id: 1 })
}
})
.catch(error => {
console.log(error);
});
};
return ( return (
...@@ -76,7 +92,7 @@ export default function Color(props) { ...@@ -76,7 +92,7 @@ export default function Color(props) {
</View> */} </View> */}
<View style={{ marginTop: 40 }}> <View style={{ marginTop: 40 }}>
<TouchableOpacity onPress={() => { getColorSession(); }} <TouchableOpacity onPress={() => { checkColorSession(); }}
style={styles.card}> style={styles.card}>
<View style={[{ flexDirection: "row" }]}> <View style={[{ flexDirection: "row" }]}>
...@@ -192,7 +208,7 @@ const styles = StyleSheet.create({ ...@@ -192,7 +208,7 @@ const styles = StyleSheet.create({
left: 50, left: 50,
bottom: 50 bottom: 50
}, },
card : { card: {
borderWidth: 5, borderWidth: 5,
borderColor: "purple", borderColor: "purple",
marginVertical: 20, marginVertical: 20,
...@@ -211,7 +227,7 @@ const styles = StyleSheet.create({ ...@@ -211,7 +227,7 @@ const styles = StyleSheet.create({
shadowOpacity: 0.3, shadowOpacity: 0.3,
shadowRadius: 1.5, shadowRadius: 1.5,
}, },
card2 : { card2: {
borderWidth: 5, borderWidth: 5,
borderColor: "orange", borderColor: "orange",
marginVertical: 20, marginVertical: 20,
...@@ -229,7 +245,7 @@ const styles = StyleSheet.create({ ...@@ -229,7 +245,7 @@ const styles = StyleSheet.create({
}, },
shadowOpacity: 0.3, shadowOpacity: 0.3,
shadowRadius: 1.5, shadowRadius: 1.5,
},card3 : { }, card3: {
borderWidth: 5, borderWidth: 5,
borderColor: "lightblue", borderColor: "lightblue",
marginVertical: 20, marginVertical: 20,
...@@ -247,20 +263,20 @@ const styles = StyleSheet.create({ ...@@ -247,20 +263,20 @@ const styles = StyleSheet.create({
}, },
shadowOpacity: 0.3, shadowOpacity: 0.3,
shadowRadius: 1.5, shadowRadius: 1.5,
},cardTitle: { }, cardTitle: {
fontWeight: "bold", fontWeight: "bold",
color: "white", color: "white",
fontSize: 35, fontSize: 35,
marginLeft: 10, marginLeft: 10,
marginTop: 80, marginTop: 80,
},cardTitle3: { }, cardTitle3: {
fontWeight: "bold", fontWeight: "bold",
color: "white", color: "white",
fontSize: 35, fontSize: 35,
marginLeft: 35, marginLeft: 35,
marginTop: 80, marginTop: 80,
} }
,cardImage: { , cardImage: {
padding: 0, padding: 0,
flex: 0.7, flex: 0.7,
}, },
......
frontend/src/screen/Home.js
View file @ b66bac08
...@@ -2,6 +2,7 @@ import React from "react"; ...@@ -2,6 +2,7 @@ import React from "react";
import { StyleSheet, View, Text, Pressable, SafeAreaView, ScrollView, Image } from 'react-native'; import { StyleSheet, View, Text, Pressable, SafeAreaView, ScrollView, Image } from 'react-native';
import Orientation from 'react-native-orientation-locker'; import Orientation from 'react-native-orientation-locker';
import ImageButton from "../component/ImageButton"; import ImageButton from "../component/ImageButton";
import AsyncStorage from '@react-native-async-storage/async-storage';
export default function Home({ navigation }){ export default function Home({ navigation }){
...@@ -10,6 +11,9 @@ export default function Home({ navigation }){ ...@@ -10,6 +11,9 @@ export default function Home({ navigation }){
} }
React.useEffect(() => { React.useEffect(() => {
AsyncStorage.removeItem('colorToken');
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
Orientation.lockToPortrait(); Orientation.lockToPortrait();
...@@ -49,7 +53,7 @@ export default function Home({ navigation }){ ...@@ -49,7 +53,7 @@ export default function Home({ navigation }){
style={styles.image} style={styles.image}
source={require('../assets/color/background.png')} source={require('../assets/color/background.png')}
resizeMode="contain"></Image> resizeMode="contain"></Image>
<ImageButton path="Progress" title="Progress Check" /> <ImageButton path="Progress" title="Progress" />
</View> </View>
{/* <View style={styles.imageView}> {/* <View style={styles.imageView}>
<Image <Image
......
frontend/src/screen/Progress.js 0 → 100644
View file @ b66bac08
import React, { Component } from 'react'
import { StyleSheet, TouchableOpacity, View, Text, Pressable, SafeAreaView, ScrollView, Image, ImageBackground, Dimensions, Animated, Easing, NativeModules } from 'react-native';
export default function Progress(){
return (
<View><Text>ddddddd</Text></View>
)
}
frontend/src/screen/activity/Black.js
View file @ b66bac08
...@@ -9,6 +9,7 @@ import CountDown from 'react-native-countdown-component'; ...@@ -9,6 +9,7 @@ import CountDown from 'react-native-countdown-component';
import client from "../client/Client"; import client from "../client/Client";
import Voice from '@react-native-voice/voice'; import Voice from '@react-native-voice/voice';
import Tts from 'react-native-tts'; import Tts from 'react-native-tts';
import AudioRecord from 'react-native-audio-record';
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import BackButton from "../../component/BackButton" import BackButton from "../../component/BackButton"
...@@ -28,6 +29,8 @@ export default function Black() { ...@@ -28,6 +29,8 @@ export default function Black() {
StatusBar.setHidden(true); StatusBar.setHidden(true);
audioInit();
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
...@@ -51,6 +54,76 @@ export default function Black() { ...@@ -51,6 +54,76 @@ export default function Black() {
}; };
}, []); }, []);
function audioInit() {
// console.log('audioInit');
const colorAudio = {
sampleRate: 16000,
channels: 1,
bitsPerSample: 16,
wavFile: 'color.wav', // thise wave file name
};
AudioRecord.init(colorAudio);
}
async function audioStart() {
// console.log('audioStart');
// checkPermission();
AudioRecord.start();
setTimeout(() => {
audioStop();
}, 2000);
}
async function audioStop() {
// console.log('audioStop');
let audioFile = await AudioRecord.stop();
// console.log('userFile', audioFile);
sendAudio(audioFile);
}
function sendAudio(audioFile) {
var obj = {
uri: `file:${audioFile}`,
type: 'audio/wav',
name: secondColor[2]+'.wav',
}
var data = JSON.stringify(obj)
// console.log(data);
client.post("predict", data, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
})
.then((response) => {
// setNames(response.data);
console.log('Success part : ', response.data);
})
.catch(function (error) {
if (error.response) {
console.log('Error data : ', error.response.data);
console.log('Error status : ', error.response.status);
console.log('Error headers : ', error.response.headers);
} else if (error.request) {
console.log('Error request : ', error.request);
} else {
console.log('Error message : ', error.message);
}
console.log('Error else part : ', error.config);
});
}
const onSpeechStartHandler = e => { const onSpeechStartHandler = e => {
// console.log('start handler =>> ', e); // console.log('start handler =>> ', e);
}; };
...@@ -75,12 +148,7 @@ export default function Black() { ...@@ -75,12 +148,7 @@ export default function Black() {
sendData(mainColor[2]) sendData(mainColor[2])
// showAlert = () => { audioStart();
// this.setState({
// showAlert: true
// });
// };
} else { } else {
......
frontend/src/screen/activity/Blue2.js
View file @ b66bac08
...@@ -8,6 +8,7 @@ import { secondColor } from '../../assets/color/color'; ...@@ -8,6 +8,7 @@ import { secondColor } from '../../assets/color/color';
import CountDown from 'react-native-countdown-component'; import CountDown from 'react-native-countdown-component';
import client from "../client/Client"; import client from "../client/Client";
import Voice from '@react-native-voice/voice'; import Voice from '@react-native-voice/voice';
import AudioRecord from 'react-native-audio-record';
import Tts from 'react-native-tts'; import Tts from 'react-native-tts';
import BackButton from "../../component/BackButton" import BackButton from "../../component/BackButton"
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
...@@ -26,6 +27,8 @@ export default function Blue2() { ...@@ -26,6 +27,8 @@ export default function Blue2() {
Voice.destroy().then(Voice.removeAllListeners); Voice.destroy().then(Voice.removeAllListeners);
StatusBar.setHidden(true); StatusBar.setHidden(true);
audioInit();
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
...@@ -49,6 +52,76 @@ export default function Blue2() { ...@@ -49,6 +52,76 @@ export default function Blue2() {
}; };
}, []); }, []);
function audioInit() {
// console.log('audioInit');
const colorAudio = {
sampleRate: 16000,
channels: 1,
bitsPerSample: 16,
wavFile: 'color.wav', // thise wave file name
};
AudioRecord.init(colorAudio);
}
async function audioStart() {
// console.log('audioStart');
// checkPermission();
AudioRecord.start();
setTimeout(() => {
audioStop();
}, 2000);
}
async function audioStop() {
// console.log('audioStop');
let audioFile = await AudioRecord.stop();
// console.log('userFile', audioFile);
sendAudio(audioFile);
}
function sendAudio(audioFile) {
var obj = {
uri: `file:${audioFile}`,
type: 'audio/wav',
name: secondColor[4]+'.wav',
}
var data = JSON.stringify(obj)
// console.log(data);
client.post("predict", data, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
})
.then((response) => {
// setNames(response.data);
console.log('Success part : ', response.data);
})
.catch(function (error) {
if (error.response) {
console.log('Error data : ', error.response.data);
console.log('Error status : ', error.response.status);
console.log('Error headers : ', error.response.headers);
} else if (error.request) {
console.log('Error request : ', error.request);
} else {
console.log('Error message : ', error.message);
}
console.log('Error else part : ', error.config);
});
}
const onSpeechStartHandler = e => { const onSpeechStartHandler = e => {
// console.log('start handler =>> ', e); // console.log('start handler =>> ', e);
}; };
...@@ -73,11 +146,7 @@ export default function Blue2() { ...@@ -73,11 +146,7 @@ export default function Blue2() {
sendData(mainColor[4]); sendData(mainColor[4]);
showAlert = () => { audioStart();
this.setState({
showAlert: true
});
};
} else { } else {
......
frontend/src/screen/activity/Green.js
View file @ b66bac08
...@@ -9,8 +9,7 @@ import { secondColor } from '../../assets/color/color'; ...@@ -9,8 +9,7 @@ import { secondColor } from '../../assets/color/color';
import client from "../client/Client"; import client from "../client/Client";
import Voice from '@react-native-voice/voice'; import Voice from '@react-native-voice/voice';
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import AudioRecord from 'react-native-audio-record';
import BackButton from "../../component/BackButton" import BackButton from "../../component/BackButton"
...@@ -29,6 +28,8 @@ export default function Green({ navigation }) { ...@@ -29,6 +28,8 @@ export default function Green({ navigation }) {
StatusBar.setHidden(true); StatusBar.setHidden(true);
audioInit();
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
...@@ -50,6 +51,77 @@ export default function Green({ navigation }) { ...@@ -50,6 +51,77 @@ export default function Green({ navigation }) {
}; };
}, []); }, []);
function audioInit() {
// console.log('audioInit');
const colorAudio = {
sampleRate: 16000,
channels: 1,
bitsPerSample: 16,
wavFile: 'color.wav', // thise wave file name
};
AudioRecord.init(colorAudio);
}
async function audioStart() {
// console.log('audioStart');
// checkPermission();
AudioRecord.start();
setTimeout(() => {
audioStop();
}, 2000);
}
async function audioStop() {
// console.log('audioStop');
let audioFile = await AudioRecord.stop();
// console.log('userFile', audioFile);
sendAudio(audioFile);
}
function sendAudio(audioFile) {
var obj = {
uri: `file:${audioFile}`,
type: 'audio/wav',
name: secondColor[1]+'.wav',
}
var data = JSON.stringify(obj)
// console.log(data);
client.post("predict", data, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
})
.then((response) => {
// setNames(response.data);
console.log('Success part : ', response.data);
})
.catch(function (error) {
if (error.response) {
console.log('Error data : ', error.response.data);
console.log('Error status : ', error.response.status);
console.log('Error headers : ', error.response.headers);
} else if (error.request) {
console.log('Error request : ', error.request);
} else {
console.log('Error message : ', error.message);
}
console.log('Error else part : ', error.config);
});
}
const onSpeechStartHandler = e => { const onSpeechStartHandler = e => {
// console.log('start handler =>> ', e); // console.log('start handler =>> ', e);
}; };
...@@ -70,17 +142,11 @@ export default function Green({ navigation }) { ...@@ -70,17 +142,11 @@ export default function Green({ navigation }) {
if (value.includes(secondColor[1]) == true) { if (value.includes(secondColor[1]) == true) {
const value = e.value;
console.log('Your Answer is Correct'); console.log('Your Answer is Correct');
sendData(mainColor[1]) sendData(mainColor[1])
// showAlert = () => { audioStart();
// this.setState({
// showAlert: true
// });
// };
} else { } else {
...@@ -194,7 +260,7 @@ export default function Green({ navigation }) { ...@@ -194,7 +260,7 @@ export default function Green({ navigation }) {
onFinish={() => setModalVisible(false)} onFinish={() => setModalVisible(false)}
digitStyle={{ backgroundColor: '#FFF', borderWidth: 2, borderColor: 'black' }} digitStyle={{ backgroundColor: '#FFF', borderWidth: 2, borderColor: 'black' }}
digitTxtStyle={{ color: 'black' }} digitTxtStyle={{ color: 'black' }}
timeLabelStyle={{ color: 'white', fontWeight: 'bold' }} timeLabelStyle={{ color: 'green', fontWeight: 'bold' }}
separatorStyle={{ color: 'black' }} separatorStyle={{ color: 'black' }}
timeToShow={['S']} timeToShow={['S']}
timeLabels={{ s: 'Seconds' }} timeLabels={{ s: 'Seconds' }}
......
frontend/src/screen/activity/Red.js
View file @ b66bac08
...@@ -7,7 +7,9 @@ import axios from "axios"; ...@@ -7,7 +7,9 @@ import axios from "axios";
import { secondColor } from '../../assets/color/color'; import { secondColor } from '../../assets/color/color';
import CountDown from 'react-native-countdown-component'; import CountDown from 'react-native-countdown-component';
import client from "../client/Client"; import client from "../client/Client";
import Tts from 'react-native-tts';
import Voice from '@react-native-voice/voice'; import Voice from '@react-native-voice/voice';
import AudioRecord from 'react-native-audio-record';
import BackButton from "../../component/BackButton" import BackButton from "../../component/BackButton"
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
...@@ -26,6 +28,10 @@ export default function Red({ navigation }) { ...@@ -26,6 +28,10 @@ export default function Red({ navigation }) {
StatusBar.setHidden(true); StatusBar.setHidden(true);
audioInit();
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
...@@ -48,6 +54,76 @@ export default function Red({ navigation }) { ...@@ -48,6 +54,76 @@ export default function Red({ navigation }) {
}; };
}, []); }, []);
function audioInit() {
// console.log('audioInit');
const colorAudio = {
sampleRate: 16000,
channels: 1,
bitsPerSample: 16,
wavFile: 'color.wav', // thise wave file name
};
AudioRecord.init(colorAudio);
}
async function audioStart() {
// console.log('audioStart');
// checkPermission();
AudioRecord.start();
setTimeout(() => {
audioStop();
}, 2000);
}
async function audioStop() {
// console.log('audioStop');
let audioFile = await AudioRecord.stop();
// console.log('userFile', audioFile);
sendAudio(audioFile);
}
function sendAudio(audioFile) {
var obj = {
uri: `file:${audioFile}`,
type: 'audio/wav',
name: secondColor[0]+'.wav',
}
var data = JSON.stringify(obj)
// console.log(data);
client.post("predict", data, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
})
.then((response) => {
// setNames(response.data);
console.log('Success part : ', response.data);
})
.catch(function (error) {
if (error.response) {
console.log('Error data : ', error.response.data);
console.log('Error status : ', error.response.status);
console.log('Error headers : ', error.response.headers);
} else if (error.request) {
console.log('Error request : ', error.request);
} else {
console.log('Error message : ', error.message);
}
console.log('Error else part : ', error.config);
});
}
const onSpeechStartHandler = e => { const onSpeechStartHandler = e => {
// console.log('start handler =>> ', e); // console.log('start handler =>> ', e);
}; };
...@@ -69,18 +145,15 @@ export default function Red({ navigation }) { ...@@ -69,18 +145,15 @@ export default function Red({ navigation }) {
if (value.includes(secondColor[0]) == true) { if (value.includes(secondColor[0]) == true) {
console.log('Your Answer is Correct'); console.log('Your Answer is Correct');
sendData(mainColor[0]);
sendData(mainColor[0]) // audioStart();
// showAlert = () => {
// this.setState({
// showAlert: true
// });
// };
} else { } else {
console.log('Your Answer is Incorrect', value); console.log('Your Answer is Incorrect', value);
setModalVisible3(true); setModalVisible3(true);
} }
...@@ -119,6 +192,8 @@ export default function Red({ navigation }) { ...@@ -119,6 +192,8 @@ export default function Red({ navigation }) {
AsyncStorage.getItem('colorToken') AsyncStorage.getItem('colorToken')
.then(res => { .then(res => {
console.log(res)
var date = new Date().getDate(); var date = new Date().getDate();
var month = new Date().getMonth() + 1; var month = new Date().getMonth() + 1;
var year = new Date().getFullYear(); var year = new Date().getFullYear();
...@@ -169,7 +244,7 @@ export default function Red({ navigation }) { ...@@ -169,7 +244,7 @@ export default function Red({ navigation }) {
const startRecording = async () => { const startRecording = async () => {
setModalVisible(true); // setModalVisible(true);
try { try {
await Voice.start('en-US'); await Voice.start('en-US');
...@@ -242,7 +317,7 @@ export default function Red({ navigation }) { ...@@ -242,7 +317,7 @@ export default function Red({ navigation }) {
style={[styles.buttonClose2]} style={[styles.buttonClose2]}
onPress={() => navigation.navigate("Green")} onPress={() => navigation.navigate("Green")}
> >
<Image source={require('../../assets/game/next.png')} resizeMode='contain' style={{ width: 100,height: 70, marginBottom:-10}} /> <Image source={require('../../assets/game/next.png')} resizeMode='contain' style={{ width: 100, height: 70, marginBottom: -10 }} />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
...@@ -272,7 +347,7 @@ export default function Red({ navigation }) { ...@@ -272,7 +347,7 @@ export default function Red({ navigation }) {
style={[]} style={[]}
onPress={() => setModalVisible3(!modalVisible3)} onPress={() => setModalVisible3(!modalVisible3)}
> >
<Image source={require('../../assets/alert/tryagain.png')} resizeMode='contain' style={{ width: 100,height: 70, marginBottom:-1}} /> <Image source={require('../../assets/alert/tryagain.png')} resizeMode='contain' style={{ width: 100, height: 70, marginBottom: -1 }} />
</TouchableOpacity> </TouchableOpacity>
</View> </View>
</View> </View>
...@@ -394,10 +469,10 @@ const styles = StyleSheet.create({ ...@@ -394,10 +469,10 @@ const styles = StyleSheet.create({
elevation: 2 elevation: 2
}, },
centeredView2: { centeredView2: {
flex: 1, flex: 1,
justifyContent: "center", justifyContent: "center",
...@@ -455,7 +530,7 @@ const styles = StyleSheet.create({ ...@@ -455,7 +530,7 @@ const styles = StyleSheet.create({
textAlign: "center", textAlign: "center",
fontSize: 30, fontSize: 30,
marginBottom: 20, marginBottom: 20,
},alert2: { }, alert2: {
backgroundColor: "white", backgroundColor: "white",
borderRadius: 50, borderRadius: 50,
width: 100, width: 100,
...@@ -464,11 +539,11 @@ const styles = StyleSheet.create({ ...@@ -464,11 +539,11 @@ const styles = StyleSheet.create({
marginTop: -80 marginTop: -80
}, },
centeredView3: { centeredView3: {
flex: 1, flex: 1,
justifyContent: "center", justifyContent: "center",
......
frontend/src/screen/activity/White.js
View file @ b66bac08
...@@ -7,6 +7,7 @@ import axios from "axios"; ...@@ -7,6 +7,7 @@ import axios from "axios";
import { secondColor } from '../../assets/color/color'; import { secondColor } from '../../assets/color/color';
import CountDown from 'react-native-countdown-component'; import CountDown from 'react-native-countdown-component';
import client from "../client/Client"; import client from "../client/Client";
import AudioRecord from 'react-native-audio-record';
import Voice from '@react-native-voice/voice'; import Voice from '@react-native-voice/voice';
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import BackButton from "../../component/BackButton" import BackButton from "../../component/BackButton"
...@@ -26,6 +27,8 @@ export default function White() { ...@@ -26,6 +27,8 @@ export default function White() {
StatusBar.setHidden(true); StatusBar.setHidden(true);
audioInit();
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
...@@ -49,6 +52,76 @@ export default function White() { ...@@ -49,6 +52,76 @@ export default function White() {
}; };
}, []); }, []);
function audioInit() {
// console.log('audioInit');
const colorAudio = {
sampleRate: 16000,
channels: 1,
bitsPerSample: 16,
wavFile: 'color.wav', // thise wave file name
};
AudioRecord.init(colorAudio);
}
async function audioStart() {
// console.log('audioStart');
// checkPermission();
AudioRecord.start();
setTimeout(() => {
audioStop();
}, 2000);
}
async function audioStop() {
// console.log('audioStop');
let audioFile = await AudioRecord.stop();
// console.log('userFile', audioFile);
sendAudio(audioFile);
}
function sendAudio(audioFile) {
var obj = {
uri: `file:${audioFile}`,
type: 'audio/wav',
name: secondColor[5]+'.wav',
}
var data = JSON.stringify(obj)
// console.log(data);
client.post("predict", data, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
})
.then((response) => {
// setNames(response.data);
console.log('Success part : ', response.data);
})
.catch(function (error) {
if (error.response) {
console.log('Error data : ', error.response.data);
console.log('Error status : ', error.response.status);
console.log('Error headers : ', error.response.headers);
} else if (error.request) {
console.log('Error request : ', error.request);
} else {
console.log('Error message : ', error.message);
}
console.log('Error else part : ', error.config);
});
}
const onSpeechStartHandler = e => { const onSpeechStartHandler = e => {
// console.log('start handler =>> ', e); // console.log('start handler =>> ', e);
}; };
...@@ -73,11 +146,7 @@ export default function White() { ...@@ -73,11 +146,7 @@ export default function White() {
sendData(mainColor[5]) sendData(mainColor[5])
showAlert = () => { audioStart();
this.setState({
showAlert: true
});
};
} else { } else {
...@@ -141,14 +210,6 @@ export default function White() { ...@@ -141,14 +210,6 @@ export default function White() {
// setPartialResults(e.value); // setPartialResults(e.value);
}; };
const onFinishCD = () => {
Alert.alert('Countdown Finished...');
}
const onPressCD = () => {
Alert.alert('Countdown Component Pressed...');
}
const startRecording = async () => { const startRecording = async () => {
setModalVisible(true); setModalVisible(true);
......
frontend/src/screen/activity/Yellow.js
View file @ b66bac08
...@@ -8,6 +8,7 @@ import CountDown from 'react-native-countdown-component'; ...@@ -8,6 +8,7 @@ import CountDown from 'react-native-countdown-component';
import { mainColor } from '../../assets/color/color'; import { mainColor } from '../../assets/color/color';
import client from "../client/Client"; import client from "../client/Client";
import Voice from '@react-native-voice/voice'; import Voice from '@react-native-voice/voice';
import AudioRecord from 'react-native-audio-record';
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import BackButton from "../../component/BackButton" import BackButton from "../../component/BackButton"
...@@ -25,6 +26,8 @@ export default function Yellow() { ...@@ -25,6 +26,8 @@ export default function Yellow() {
Voice.destroy().then(Voice.removeAllListeners); Voice.destroy().then(Voice.removeAllListeners);
StatusBar.setHidden(true); StatusBar.setHidden(true);
audioInit();
const unsubscribe = navigation.addListener("focus", () => { const unsubscribe = navigation.addListener("focus", () => {
Orientation.unlockAllOrientations(); Orientation.unlockAllOrientations();
...@@ -48,6 +51,76 @@ export default function Yellow() { ...@@ -48,6 +51,76 @@ export default function Yellow() {
}; };
}, []); }, []);
function audioInit() {
// console.log('audioInit');
const colorAudio = {
sampleRate: 16000,
channels: 1,
bitsPerSample: 16,
wavFile: 'color.wav', // thise wave file name
};
AudioRecord.init(colorAudio);
}
async function audioStart() {
// console.log('audioStart');
// checkPermission();
AudioRecord.start();
setTimeout(() => {
audioStop();
}, 2000);
}
async function audioStop() {
// console.log('audioStop');
let audioFile = await AudioRecord.stop();
// console.log('userFile', audioFile);
sendAudio(audioFile);
}
function sendAudio(audioFile) {
var obj = {
uri: `file:${audioFile}`,
type: 'audio/wav',
name: secondColor[3]+'.wav',
}
var data = JSON.stringify(obj)
// console.log(data);
client.post("predict", data, {
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
},
})
.then((response) => {
// setNames(response.data);
console.log('Success part : ', response.data);
})
.catch(function (error) {
if (error.response) {
console.log('Error data : ', error.response.data);
console.log('Error status : ', error.response.status);
console.log('Error headers : ', error.response.headers);
} else if (error.request) {
console.log('Error request : ', error.request);
} else {
console.log('Error message : ', error.message);
}
console.log('Error else part : ', error.config);
});
}
const onSpeechStartHandler = e => { const onSpeechStartHandler = e => {
// console.log('start handler =>> ', e); // console.log('start handler =>> ', e);
}; };
...@@ -72,11 +145,7 @@ export default function Yellow() { ...@@ -72,11 +145,7 @@ export default function Yellow() {
sendData(mainColor[3]) sendData(mainColor[3])
showAlert = () => { audioStart();
this.setState({
showAlert: true
});
};
} else { } else {
......
frontend/src/screen/client/Client.js
View file @ b66bac08
...@@ -2,6 +2,6 @@ import axios from 'axios'; ...@@ -2,6 +2,6 @@ import axios from 'axios';
// export default axios.create({ baseURL: 'http://192.168.8.102:5000/', timeout: 15000, }); // export default axios.create({ baseURL: 'http://192.168.8.102:5000/', timeout: 15000, });
export default axios.create({ export default axios.create({
baseURL: 'http://192.168.1.101:5000/', baseURL: 'http://192.168.8.100:5000/',
timeout: 15000, timeout: 15000,
}); });
package-lock.json 0 → 100644
View file @ b66bac08
{
"name": "21_22j-38",
"lockfileVersion": 2,
"requires": true,
"packages": {}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment