From b20578754528c4890ed71b4943f3c95e07cebf7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Wed, 7 Aug 2019 21:39:25 +0900 Subject: [PATCH] Fix: requestMainMenuApp --- src/game/main_menu/main_menu.js | 27 ++++++++++++++++++++++++++- src/web/php/menu/menu_list.php | 8 ++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/game/main_menu/main_menu.js b/src/game/main_menu/main_menu.js index d55bbc3..8dd00fa 100644 --- a/src/game/main_menu/main_menu.js +++ b/src/game/main_menu/main_menu.js @@ -141,7 +141,7 @@ MainMenu.prototype.loadAppData = function() { this.selectedLanguage, (function(replyJSON) { // this.updateAppGroupTab(replyJSON.appGroupData); - // this.updateAppButtons(replyJSON.appGroup, replyJSON.appData); + this.updateAppButtons(replyJSON.appGroup, replyJSON.appData); // this.updateLanguageTab(replyJSON.appGroup); }).bind(this), (function(replyJSON) { @@ -163,6 +163,31 @@ MainMenu.prototype.loadAppData = function() { */ } +MainMenu.prototype.updateAppButtons = function(appGroup, appData) { + switch(appGroup) { + case MainMenu.APP_GROUP_FINGER_POSITION: + this.makeFingerPositionAppButtons(); + break; + + case MainMenu.APP_GROUP_TYPING_PRACTICE: + this.makeTypingPracticeAppButtons(); + break; + + case MainMenu.APP_GROUP_TYPING_TEST: + this.makeTypingTestAppButtons(); + break; + + case MainMenu.APP_GROUP_TYPING_PLAY: + this.makeTypingPlayAppButtons(); + break; + + case MainMenu.APP_GROUP_MOUSE_PLAY: + this.makeMousePlayAppButtons(); + break; + + } +} + MainMenu.prototype.loadSucceeded = function(replyJSON) { // console.log(replyJSON); diff --git a/src/web/php/menu/menu_list.php b/src/web/php/menu/menu_list.php index eba04a6..9aedf68 100644 --- a/src/web/php/menu/menu_list.php +++ b/src/web/php/menu/menu_list.php @@ -28,8 +28,12 @@ include "./../db/menu_collection.php"; $menuCollection = new MenuCollection($dbConnector->getMysqli()); // $systemWritingArray = $menuCollection->getSystemWritingList(); -$jsonBuilder->setData("appGroup", $menuCollection->getAppGroupName($appGroup)); -$jsonBuilder->setData("language", $menuCollection->getLanguageName($language)); +$jsonBuilder->setData("appGroupName", $menuCollection->getAppGroupName($appGroup)); +$jsonBuilder->setData("languageName", $menuCollection->getLanguageName($language)); + +$jsonBuilder->setData("appGroup", $appGroup); +$jsonBuilder->setData("appData", $appData); + $jsonBuilder->sendResultSuccess(); /*