Merge branch 'beta'

szdjg/Onload.js

@@ -37,6 +37,12 @@ window.onload = function () {
     //U.MD.D.isLogin();
     // U.MD.D.fullscreen();
     U.MD.D.stopSafari();
+    if(U.UF.C.queryString('form')){
+      U.UF.Cookie.set('form='+U.UF.C.queryString('form'))
+    }
+    if(U.UF.C.queryString('state')){
+      U.UF.Cookie.set('state='+U.UF.C.queryString('state'))
+    }
     U.MD.D.I.openApplication('aiCourseResource')
     // window.addEventListener('resize', () => {
     //     var realHeight = window.innerHeight
@@ -1060,7 +1066,14 @@ function selectUser(uid, callback) {
   const requestUser = () => {
       U.A.Request(`${US.Config.pbl}selectUser?userid=${uid}`, [], function (res) {
           if(res && res.value && res.value.length && res.value[0].length && res.value[0][0].userid){
-              if (callback) callback(res);
+            let form = U.UF.Cookie.get('form')
+            let state = U.UF.Cookie.get('state')
+            if(form == 'desktop') {
+              U.UF.Cookie.del('form')
+              U.UF.Cookie.del('state')
+              window.location.href=`cocorobo://auth/callback?apiKey=${res.value[0][0].apikey}&state=${state}&userid=${res.value[0][0].userid}&username=${res.value[0][0].username}&schoolname=${res.value[0][0].schoolName}`
+            }
+            if (callback) callback(res);
           }else {
               U.alert("获取用户信息失败，正在重试!")
               LoginState = false