Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -222,6 +222,7 @@ U.MD.D.I.orgStemDeskIcon = [
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
 U.MD.D.I.szulsDeskIcon = [
@@ -2246,7 +2247,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         )
         _easyDesktopIconInfo.push({ "Name": "AI共創", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)", "width": '114px', 'height': '114px' } })
     }
-    if (_oid == '45facc0a-1211-11ec-80ad-005056b86db5' || _org == '0fec3a8a-ad04-11ed-b13d-005056b86db5' || _org == '4d3812ef-fa66-11ef-b508-005056924926' || _oid == "0df61e4c-fe2d-11ef-b508-005056924926" || _org == 'eaee75a4-ff2e-11ef-b508-005056924926' || _org == 'e775a5d7-039a-11f0-b508-005056924926') {
+    if (_oid == '45facc0a-1211-11ec-80ad-005056b86db5' || _org == '0fec3a8a-ad04-11ed-b13d-005056b86db5' || _org == '4d3812ef-fa66-11ef-b508-005056924926' || _oid == "0df61e4c-fe2d-11ef-b508-005056924926" || _org == 'eaee75a4-ff2e-11ef-b508-005056924926' || _org == 'e775a5d7-039a-11f0-b508-005056924926' || _org == '4d3812ef-fa66-11ef-b508-005056924926') {
         _teacherDesktopIconInfo.push(
             // { "Name": "chatPDF", "Url": "chatPDF", "style": { "cssText": "background-image:url(/img/icon/chatPDF.png)" } },
             { "Name": "學習分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.png)" } },
@@ -5070,6 +5071,8 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
         U.MD.D.I.openApplication("project")
     } else if (e.data.tools && e.data.tools == "71") {
         U.MD.D.I.openApplication("aigptCourse")
+    } else if (e.data.tools && e.data.tools == "72") {
+        U.MD.D.I.openInApplication("gptConfig", e.data.data)
     } else if (e.data.tools && e.data.tools == "1s") {
         U.MD.D.I.openApplicationJieS("whiteboard", e.data.cid, e.data.stage, e.data.task, e.data.tool)
     } else if (e.data.tools && e.data.tools == "3s") {
@@ -5607,6 +5610,17 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                     }, { "style": { "height": "36px" } }).form; //創建窗體
                     break;
                 }
+        case "gptConfig":
+            _formdiv = new U.UF.UI.form(
+                data.name ? data.name : "应用中心",
+                $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": data.url }), {
+                "id": "gptConfig" + data.id,
+                "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //创建窗体
+            break;
     }
 }
 U.MD.D.I.openApplication = function (str, obj, info) {
@@ -7550,6 +7564,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/pblCourse.png)" }, "name": "學生PBL", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
         case "appStore":
+            U.MD.D.addOp('','cocoflowOpen','')
                 _formdiv = new U.UF.UI.form(
                     "CocoFlow",
                     $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//cloud.cocorobo.hk/aigpt/#/WorkSpace?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
@@ -10974,3 +10989,11 @@ U.MD.D.I.getUploadContent = function (cid, s, task, t, uid, atool, type, iframe)
         }
     }, [], { "type": "POST", "withCredentials": true });
 }
+
+U.MD.D.addOp = function(text,type,time){
+    var userInfo = US.userInfo;
+    if(Object.keys(userInfo).length !== 0){
+        U.A.Request(US.Config.pbl + "addOperationTimeT", [userInfo.userid,text,type,time], function (res) {
+        }, [], { "type": "POST", "withCredentials": true });
+    }
+}

js/Desktop/Onload.js

@@ -331,9 +331,9 @@ U.MD.D.getuser = function () {
                             if ($("#U_MD_HomeC_Pop")[0]) {
                                 $("#U_MD_HomeC_Pop")[0].close(); //關閉登陸
                             }
-                            U.A.Request(US.Config.pbl + "selectUser?userid=" + _user.userid, [], function (res) { //US.userInfo.userid
-                                loginSet(res.value[0][0], res)
-                            }, [], { "type": "GET", "withCredentials": true });
+                            selectUser(_user.userid, (res) => {
+                              loginSet(res.value[0][0], res);
+                            });
                         }
 
                     }, [], { "type": "GET", "withCredentials": true });
@@ -393,9 +393,9 @@ U.MD.D.getuser = function () {
                             if(a.length>0){
                                 let userId = a[0][0].userid
                                 US.userInfo.userid = userId
-                                U.A.Request(US.Config.pbl + "selectUser?userid=" + userId, [], function (res) { //US.userInfo.userid
-                                    loginSet(res.value[0][0], res)
-                                }, [], { "type": "GET", "withCredentials": true });
+                                selectUser(userId, (res) => {
+                                    loginSet(res.value[0][0], res);
+                                });
                             }
                             
                         })
@@ -457,9 +457,9 @@ U.MD.D.getuser = function () {
                             if(a.length>0){
                                 let userId = a[0][0].userid
                                 US.userInfo.userid = userId
-                                U.A.Request(US.Config.pbl + "selectUser?userid=" + userId, [], function (res) { //US.userInfo.userid
-                                    loginSet(res.value[0][0], res)
-                                }, [], { "type": "GET", "withCredentials": true });
+                                selectUser(userId, (res) => {
+                                    loginSet(res.value[0][0], res);
+                                });
                             }
                             
                         })
@@ -525,10 +525,10 @@ U.MD.D.getuser = function () {
                             if(a.length>0){
                                 let userId = a[0][0].userid
                                 US.userInfo.userid = userId
-                                U.A.Request(US.Config.pbl + "selectUser?userid=" + userId, [], function (res) { //US.userInfo.userid
+                                selectUser(userId, (res) => {
                                     loginSet(res.value[0][0], res)
                                     U.UF.DL.uploading(document.body)
-                                }, [], { "type": "GET", "withCredentials": true });
+                                });
                             }
                             
                         })
@@ -684,7 +684,7 @@ U.MD.D.getuser2 = function (userid, cid) {
                 }
                 let userId = a[0][0].userid
                 US.userInfo.userid = userId
-                U.A.Request(US.Config.pbl + "selectUser?userid=" + userid, [], function (res) { //US.userInfo.userid
+                selectUser(userId, (res) => {
                     if ($("#U_MD_HomeC_Pop")[0]) {
                         $("#U_MD_HomeC_Pop")[0].close(); //关闭登陆
                     }
@@ -719,7 +719,7 @@ U.MD.D.getuser2 = function (userid, cid) {
                     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                     U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
                     U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
-                }, [], { "type": "GET", "withCredentials": true });
+                });
             }
             
         })
@@ -1157,4 +1157,20 @@ function loginSet(userInfo, res){
         U.MD.D.I.openApplication(U.UF.C.queryString('app'))
     }
     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
+}
+
+
+function selectUser(uid, callback) {
+    const requestUser = () => {
+        U.A.Request(US.Config.pbl + "selectUser?userid=" + uid, [], function (res) {
+            if (callback) callback(res);
+        }, [], { "type": "GET", "withCredentials": true });
+    };
+
+    try {
+        requestUser();
+    } catch (error) {
+        U.alert("登录失败，正在重试!")
+        requestUser();
+    }
 }