diff --git a/IDManager.py b/IDManager.py index 7f8faa4..9d6a657 100644 --- a/IDManager.py +++ b/IDManager.py @@ -24,11 +24,11 @@ class idManager(): self.gid = 0 def iniId(self, ip): - self.ip_id[ip] = ip + self.ip_id[str(ip)] = str(ip) # self.gid += 1 # self.ip_dic[ip] = str(self.gid) # return str(self.gid) - return ip + return str(ip) def getId(self, ip): return self.ip_dic[ip] @@ -91,10 +91,8 @@ class idManager(): def setControl(self, ip, content): if content == "A": - print("A" + ip) self.ip_control[ip] = 0 else: - print("B" + ip) self.ip_control[ip] = 1 def setTimes(self, ip): diff --git a/main.py b/main.py index d6aa94e..0600fe5 100644 --- a/main.py +++ b/main.py @@ -66,7 +66,7 @@ def gametutorial(id): @app.route('/again') def gamepreplayAgain(): - return redirect(url_for('gameplay', getId())) + return redirect(url_for('gameplay', id=getId())) @app.route('/gametutorial//data') @@ -92,7 +92,7 @@ def getJSONData(id): @app.route('/annotation') def gamepreanno(): - return redirect(url_for('gameanno', getId())) + return redirect(url_for('gameanno', id=getId())) @app.route('/annotation/') @@ -125,7 +125,7 @@ def getRadioData(): @app.route('/gameplay2') def gamepreplay2(): - return redirect(url_for('gameplay2', getId())) + return redirect(url_for('gameplay2', id=getId())) @app.route('/gameplay2/') @@ -146,7 +146,7 @@ def getJSONData2(id): @app.route('/annotation2') def gamepreanno2(): - return redirect(url_for('gameanno2', getId())) + return redirect(url_for('gameanno2', id=getId())) @app.route('/annotation2/')