Merge branch 'beta'

js/Desktop/Onload.js

@@ -475,6 +475,15 @@ U.MD.D.getuser = function () {
                                     console.log(shareCourseId);
                                     U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
                                 }
+                                if(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
+                                    U.MD.D.I.openApplication("project")
+                                }
+                                if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
+                                    U.MD.D.I.openApplication("study")
+                                }
+                                if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
+                                    U.MD.D.I.openApplication("studentStudy")
+                                }
                                 U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                             }, [], { "type": "GET", "withCredentials": true });
                         }
@@ -679,6 +688,15 @@ U.MD.D.getuser = function () {
                                         console.log(shareCourseId);
                                         U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
                                     }
+                                    if(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
+                                        U.MD.D.I.openApplication("project")
+                                    }
+                                    if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
+                                        U.MD.D.I.openApplication("study")
+                                    }
+                                    if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
+                                        U.MD.D.I.openApplication("studentStudy")
+                                    }
                                     U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                                 }, [], { "type": "GET", "withCredentials": true });
                             }
@@ -932,6 +950,15 @@ U.MD.D.getuser2 = function (userid, cid) {
         }else{
             U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
         }
+        if(res.value[0][0].type === 1 && window.location.hash.indexOf('project') != -1){
+            U.MD.D.I.openApplication("project")
+        }
+        if(res.value[0][0].type === 1 && window.location.hash.indexOf('study') != -1){
+            U.MD.D.I.openApplication("study")
+        }
+        if(res.value[0][0].type === 2 && window.location.hash.indexOf('study') != -1){
+            U.MD.D.I.openApplication("studentStudy")
+        }
         U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
         U.MD.D.I.openInApplication("studyDetail", cid, 2, 2)
     }, [], { "type": "GET", "withCredentials": true });