bug fix

ENTITYSmartMirror · Oct 29, 2019 · cd9837d · cd9837d
1 parent abe3430
commit cd9837d
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 9 deletions.
diff --git a/modules/CategoryChoiceAsia/CategoryChoiceAsia.js b/modules/CategoryChoiceAsia/CategoryChoiceAsia.js
@@ -165,6 +165,7 @@ Module.register("CategoryChoiceAsia",{
 								// Prints the visited hideURL.
 								console.log("Visiting show URL: "+data.showUrl);
 							}
+
 								if (modules[i].name == 'Asia-China') {
 
 									for(var num=1; num<30; num++ ){
@@ -176,9 +177,10 @@ Module.register("CategoryChoiceAsia",{
 										modules[10].show(self.config.animationSpeed, {force: self.config.allowForce});
 										modules[28].show(self.config.animationSpeed, {force: self.config.allowForce});
 									},500);
+									CategoryChoiceAsia.sendNotification("china is clicked");
 								}
 
-							CategoryChoiceAsia.sendNotification("CategoryChoiceAsia is Clicked");
+
 						}
 					}
 				}

diff --git a/modules/CategoryManhair/CategoryManhair.js b/modules/CategoryManhair/CategoryManhair.js
@@ -167,30 +167,37 @@ Module.register("CategoryManhair",{
 										console.log("Hiding opend "+ modules[num].name+" ID: "+idnr[1]);
 										modules[num].hide(self.config.animationSpeed, {force: self.config.allowForce});	
 										}
+
 										console.log("Showing "+modules[4].name+" ID: "+idnr[1]);	
+
 										setTimeout(function(){
 											modules[8].show(self.config.animationSpeed, {force: self.config.allowForce});
-											modules[29].show(self.config.animationSpeed, {force: self.config.allowForce});
+											modules[28].show(self.config.animationSpeed, {force: self.config.allowForce});
 										},500);
+										CategoryManhair.sendNotification("jeju is clicked");
+										CategoryManhair.sendNotification("CategoryManhair is Clicked");
+
 									}
 
 									if (age === 'adult'){
 										for(var num=1; num<30; num++ ){
 										console.log("Hiding opend "+ modules[num].name+" ID: "+idnr[1]);
 										modules[num].hide(self.config.animationSpeed, {force: self.config.allowForce});	
 										}
+
 										console.log("Showing "+modules[4].name+" ID: "+idnr[1]);	
+
 										setTimeout(function(){
 											modules[9].show(self.config.animationSpeed, {force: self.config.allowForce});
-											modules[29].show(self.config.animationSpeed, {force: self.config.allowForce});
+											modules[28].show(self.config.animationSpeed, {force: self.config.allowForce});
 										},500);
+										CategoryManhair.sendNotification("jeju is clicked");
+										CategoryManhair.sendNotification("CategoryManhair is Clicked");
+						}
 									}
 								}
-
-							CategoryManhair.sendNotification("CategoryManhair is Clicked");
 
-							console.log(age);
-						}
+
 					}
 				}
 			}

diff --git a/modules/CategorySelectMain/CategorySelectMain.js b/modules/CategorySelectMain/CategorySelectMain.js
@@ -88,6 +88,10 @@ Module.register("CategorySelectMain",{
 			module1 = 'Modulebar2 is Clicked';
 			Log.info(module1 + " adadadadad : " + notification);
 		}
+		else if (notification === 'china is clicked') {
+			module1 = 'Modulebar3 is Clicked';
+			Log.info(module1 + " adadadadad : " + notification);
+		}
 		else if (notification === 'Modulebar2 is Clicked') {
 			module1 = 'Modulebar2 is Clicked';
 			Log.info(module1 + " adadadadad : " + notification);
@@ -191,7 +195,14 @@ Module.register("CategorySelectMain",{
 									setTimeout(function(){
 										modules[3].show(self.config.animationSpeed, {force: self.config.allowForce});
 									},500);
-								}					
+								}
+								else if (module1 === 'Modulebar3 is Clicked'){
+									console.log("Showing2 "+modules[4].name+" ID: "+idnr[1]);	
+									module1 = 'Modulebar2 is Clicked';
+										setTimeout(function(){
+											modules[4].show(self.config.animationSpeed, {force: self.config.allowForce});
+										},500);
+									}								
 							}
 							if (modules[i].name === 'Man10s') {
 								for (var k = 1; k < 30; k++){
@@ -203,6 +214,7 @@ Module.register("CategorySelectMain",{
 								modules[1].show(self.config.animationSpeed, {force: self.config.allowForce});
 								},500);								
 							}
+							CategorySelectMain.sendNotification("Modules All Change");
 						}					
 					}
 				}

diff --git a/modules/MMM-EmbedYoutube1/MMM-EmbedYoutube1.js b/modules/MMM-EmbedYoutube1/MMM-EmbedYoutube1.js
@@ -66,6 +66,26 @@ Module.register("MMM-EmbedYoutube1", {
 	notificationReceived: function(notification, payload) {
 		Log.info(this.name + " - received notification: " + notification);
 
+		if(notification === "jeju is clicked"){
+			this.config.video_id="-rxVy7NpZAk"
+			this.config.searchlist1="제주여행"
+
+			this.updateDom()
+		}
+
+		if(notification === "china is clicked"){
+			this.config.video_id="X13sr1Rv-CM"
+			this.config.searchlist1="중국여행"
+
+			this.updateDom()
+		}
+
+		if(notification === "Modules All Change"){
+			this.config.video_id="TGLMBIIKT4Y"
+
+			this.updateDom()
+		}
+
 		if(notification === "PLAYLISTCHANGE"){
 			var payload1=payload.split("_");
 			console.log("thisconfigid : "+payload)

diff --git a/modules/The2Airport/The2Airport.js b/modules/The2Airport/The2Airport.js
@@ -29,7 +29,7 @@ Module.register("The2Airport",{
         // The direction of the bar. Options: row, column, row-reverse or column-reverse
         direction: "column",
 		// The speed of the hide and show animation.
-		animationSpeed: 1000,
+		animationSpeed: 500,
         // The default button 1. Add your buttons in the config.
         buttons: {
 										"1": {