panweitong 4 years ago
parent
commit
8e91919d94

+ 11 - 11
index.js

@@ -187,13 +187,13 @@ $(window).one("load", () => {
 
   // 判断从python blcokly 跳转过来是ai或者iot
   if (window.location.search.indexOf('name') > -1 || getLocalStorage("type") == 1) {
-    $("#mode")[0].selectedIndex = 1;
+    $("#mode")[0].selectedIndex = 0;
     $("#mode")[0].onchange();
     $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
     selectmode($("#mode")[0], true);
     appearExample(1);
   } else {
-    $("#mode")[0].selectedIndex = 0;
+    $("#mode")[0].selectedIndex = 1;
     $("#mode")[0].onchange();
     $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
     selectmode($("#mode")[0], true);
@@ -314,7 +314,7 @@ $(window).one("load", () => {
 
 
 window.onbeforeunload = window.onunload = function () {
-  if ($("#mode")[0].selectedIndex == 0) {
+  if ($("#mode")[0].selectedIndex == 1) {
     saveLocalStorage("type", 0);
     saveLocalStorageBlocks("pythonai-mode-blocks-xml");
   } else {
@@ -760,13 +760,13 @@ function selectOnload() {
       var e = e.target;
       if (e.parentElement.children[2] && e.parentElement.children[2].children.length > 0) { } else {
         if (e.innerHTML == Ardublockly.LOCALISED_TEXT.iot_module) {
-          $("#mode")[0].selectedIndex = 1;
+          $("#mode")[0].selectedIndex = 0;
           $("#mode")[0].onchange();
           $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
           appearExample(1);
         }
         else if (e.innerHTML == Ardublockly.LOCALISED_TEXT.ai_module) {
-          $("#mode")[0].selectedIndex = 0;
+          $("#mode")[0].selectedIndex = 1;
           $("#mode")[0].onchange();
           $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
           appearExample(0);
@@ -954,12 +954,12 @@ function selectOnload() {
         $('#ai_tt div')[j].onclick = (function (i, j) {
           return function () {
             if (_arr[i][j].split("/")[0] == "Main") {
-              $("#mode")[0].selectedIndex = 1;
+              $("#mode")[0].selectedIndex = 0;
               $("#mode")[0].onchange();
               $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
               appearExample(1);
             } else {
-              $("#mode")[0].selectedIndex = 0;
+              $("#mode")[0].selectedIndex = 1;
               $("#mode")[0].onchange();
               $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
               appearExample(0);
@@ -990,12 +990,12 @@ function selectOnload() {
         ai_tt.children[j].onclick = (function (i, j) {
           return function () {
             if (_arr[i][j].split("/")[0] == "Main") {
-              $("#mode")[0].selectedIndex = 1;
+              $("#mode")[0].selectedIndex = 0;
               $("#mode")[0].onchange();
               $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
               appearExample(1);
             } else {
-              $("#mode")[0].selectedIndex = 0;
+              $("#mode")[0].selectedIndex = 1;
               $("#mode")[0].onchange();
               $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
               appearExample(0);
@@ -1020,12 +1020,12 @@ function selectOnload() {
       $('ul.HarxA')[i].children[j].onclick = (function (i, j) {
         return function () {
           if (_arr[i][j].split("/")[0] == "Main") {
-            $("#mode")[0].selectedIndex = 1;
+            $("#mode")[0].selectedIndex = 0;
             $("#mode")[0].onchange();
             $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
             appearExample(1);
           } else {
-            $("#mode")[0].selectedIndex = 0;
+            $("#mode")[0].selectedIndex = 1;
             $("#mode")[0].onchange();
             $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
             appearExample(0);

+ 21 - 21
python/index.js

@@ -317,7 +317,7 @@ $(window).one("load", () => {
 
 
 window.onbeforeunload = window.onunload = function () {
-  if ($("#mode")[0].selectedIndex == 0) {
+  if ($("#mode")[0].selectedIndex == 1) {
     saveLocalStorage("type", 0);
     saveLocalStorageBlocks("pythonai-mode-blocks-xml");
   } else {
@@ -759,13 +759,13 @@ function selectOnload() {
       var e = e.target;
       if (e.parentElement.children[2] && e.parentElement.children[2].children.length > 0) { } else {
         if (e.innerHTML == Ardublockly.LOCALISED_TEXT.iot_module) {
-          $("#mode")[0].selectedIndex = 1;
+          $("#mode")[0].selectedIndex = 0;
           $("#mode")[0].onchange();
           $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
           window.location.href = "/?" + window.location.href.split("?")[1];
         }
         else if (e.innerHTML == Ardublockly.LOCALISED_TEXT.ai_module) {
-          $("#mode")[0].selectedIndex = 0;
+          $("#mode")[0].selectedIndex = 1;
           $("#mode")[0].onchange();
           $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
           window.location.href = "/?" + window.location.href.split("?")[1];
@@ -953,15 +953,15 @@ function selectOnload() {
         $('#ai_tt div')[j].onclick = (function (i, j) {
           return function () {
             if (_arr[i][j].split("/")[0] == "Main") {
-              $("#mode")[0].selectedIndex = 1;
+              $("#mode")[0].selectedIndex = 0;
               $("#mode")[0].onchange();
-              $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
-              appearExample(1);
+              // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+              // appearExample(1);
             } else {
-              $("#mode")[0].selectedIndex = 0;
+              $("#mode")[0].selectedIndex = 1;
               $("#mode")[0].onchange();
-              $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
-              appearExample(0);
+              // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+              // appearExample(0);
             }
             $('.ModeSelect')[0].className = 'ModeSelect';
             Ardublockly.alertExampleMessage(
@@ -989,15 +989,15 @@ function selectOnload() {
         ai_tt.children[j].onclick = (function (i, j) {
           return function () {
             if (_arr[i][j].split("/")[0] == "Main") {
-              $("#mode")[0].selectedIndex = 1;
+              $("#mode")[0].selectedIndex = 0;
               $("#mode")[0].onchange();
-              $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
-              appearExample(1);
+              // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+              // appearExample(1);
             } else {
-              $("#mode")[0].selectedIndex = 0;
+              $("#mode")[0].selectedIndex = 1;
               $("#mode")[0].onchange();
-              $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
-              appearExample(0);
+              // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+              // appearExample(0);
             }
             $('.ModeSelect')[0].className = 'ModeSelect';
             readTxt("src/python/" + _arr[i][j], function (txt) {
@@ -1019,15 +1019,15 @@ function selectOnload() {
       $('ul.HarxA')[i].children[j].onclick = (function (i, j) {
         return function () {
           if (_arr[i][j].split("/")[0] == "Main") {
-            $("#mode")[0].selectedIndex = 1;
+            $("#mode")[0].selectedIndex = 0;
             $("#mode")[0].onchange();
-            $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
-            appearExample(1);
+            // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+            // appearExample(1);
           } else {
-            $("#mode")[0].selectedIndex = 0;
+            $("#mode")[0].selectedIndex = 1;
             $("#mode")[0].onchange();
-            $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
-            appearExample(0);
+            // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+            // appearExample(0);
           }
           $('.ModeSelect')[0].className = 'ModeSelect';
           Ardublockly.alertExampleMessage(

+ 4 - 4
python/src/blockly/ardublockly.js

@@ -599,14 +599,14 @@ Ardublockly.FileReaderLocal = function (xmlFile) {
         try {
             var xmlDom = Blockly.Xml.textToDom(result_xml);
             if (xmlDom.getAttribute("type") == "AI") {
-                $("#mode")[0].selectedIndex = 0;
+                $("#mode")[0].selectedIndex = 1;
                 $("#mode")[0].onchange();
-                $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+                // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
             }
             else {
-                $("#mode")[0].selectedIndex = 1;
+                $("#mode")[0].selectedIndex = 0;
                 $("#mode")[0].onchange();
-                $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+                // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
             }
         } catch (e) {
             return false;

+ 4 - 4
python/src/blockly/cocoblockly.js

@@ -383,18 +383,18 @@ function getmcnty() {
                 $('#status_bar').replaceWith(`<span id="status_bar"><span id="status_txt">${Ardublockly.LOCALISED_TEXT.statusbar}&nbsp&nbsp&nbsp&nbsp</span></span>`);
                 isgetmcnty = true;
                 $('#ports').material_select();
-                $("#mode")[0].selectedIndex = 1;
+                $("#mode")[0].selectedIndex = 0;
                 $("#mode")[0].onchange();
                 $('#progress').css("display", "block");
-                $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+                // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
             } else if (data.responseText == "AI") {
                 $('#status_bar').replaceWith(`<span id="status_bar"><span id="status_txt">${Ardublockly.LOCALISED_TEXT.statusbar}&nbsp&nbsp&nbsp&nbsp</span></span>`);
                 isgetmcnty = true;
                 $('#ports').material_select();
-                $("#mode")[0].selectedIndex = 0;
+                $("#mode")[0].selectedIndex = 1;
                 $("#mode")[0].onchange();
                 $('#progress').css("display", "block");
-                $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+                // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
             }
         },
         error: function (error) {

+ 4 - 4
python/src/blockly/load.js

@@ -22,13 +22,13 @@ function ready() {
     setTimeout(() => {
         var _type = getLocalStorage("type") || 0;
         if (_type == 1) {
-            $("#mode")[0].selectedIndex = 1;
-            $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+            $("#mode")[0].selectedIndex = 0;
+            // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
             selectmode($("#mode")[0], true);
         }
         else {
-            $("#mode")[0].selectedIndex = 0;
-            $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+            $("#mode")[0].selectedIndex = 1;
+            // $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
             selectmode($("#mode")[0], true);
         }
     }, 2000);

+ 4 - 2
src/blockly/ardublockly.js

@@ -599,14 +599,16 @@ Ardublockly.FileReaderLocal = function (xmlFile) {
         try {
             var xmlDom = Blockly.Xml.textToDom(result_xml);
             if (xmlDom.getAttribute("type") == "AI") {
-                $("#mode")[0].selectedIndex = 0;
+                $("#mode")[0].selectedIndex = 1;
                 $("#mode")[0].onchange();
                 $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+                appearExample(0);
             }
             else {
-                $("#mode")[0].selectedIndex = 1;
+                $("#mode")[0].selectedIndex = 0;
                 $("#mode")[0].onchange();
                 $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+                appearExample(1);
             }
         } catch (e) {
             return false;

+ 4 - 2
src/blockly/cocoblockly.js

@@ -383,18 +383,20 @@ function getmcnty() {
                 $('#status_bar').replaceWith(`<span id="status_bar"><span id="status_txt">${Ardublockly.LOCALISED_TEXT.statusbar}&nbsp&nbsp&nbsp&nbsp</span></span>`);
                 isgetmcnty = true;
                 $('#ports').material_select();
-                $("#mode")[0].selectedIndex = 1;
+                $("#mode")[0].selectedIndex = 0;
                 $("#mode")[0].onchange();
                 $('#progress').css("display", "block");
                 $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
+                appearExample(1);
             } else if (data.responseText == "AI") {
                 $('#status_bar').replaceWith(`<span id="status_bar"><span id="status_txt">${Ardublockly.LOCALISED_TEXT.statusbar}&nbsp&nbsp&nbsp&nbsp</span></span>`);
                 isgetmcnty = true;
                 $('#ports').material_select();
-                $("#mode")[0].selectedIndex = 0;
+                $("#mode")[0].selectedIndex = 1;
                 $("#mode")[0].onchange();
                 $('#progress').css("display", "block");
                 $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
+                appearExample(0);
             }
         },
         error: function (error) {

+ 4 - 2
src/blockly/load.js

@@ -22,14 +22,16 @@ function ready() {
     setTimeout(() => {
         var _type = getLocalStorage("type") || 0;
         if (_type == 1) {
-            $("#mode")[0].selectedIndex = 1;
+            $("#mode")[0].selectedIndex = 0;
             $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.iot_module;
             selectmode($("#mode")[0], true);
+            appearExample(1);
         }
         else {
-            $("#mode")[0].selectedIndex = 0;
+            $("#mode")[0].selectedIndex = 1;
             $('.selectMode_input')[0].value = Ardublockly.LOCALISED_TEXT.ai_module;
             selectmode($("#mode")[0], true);
+            appearExample(0);
         }
     }, 2000);